Remove obsolete deriving Typeable everywhere

andreasabel · andreasabel · commit b985b81603e5 · 2025-09-08T10:33:46.000+02:00
diff --git a/example-client/example-client.cabal b/example-client/example-client.cabal
@@ -47,8 +47,7 @@ executable example-client
                        hackage-security-http-client
   hs-source-dirs:      src
   default-language:    Haskell2010
-  default-extensions:  DeriveDataTypeable
-                       FlexibleContexts
+  default-extensions:  FlexibleContexts
                        RankNTypes
                        RecordWildCards
                        ScopedTypeVariables
diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal
@@ -85,8 +85,7 @@ executable hackage-repo-tool
 
 
   default-language:    Haskell2010
-  default-extensions:  DeriveDataTypeable
-                       FlexibleContexts
+  default-extensions:  FlexibleContexts
                        FlexibleInstances
                        NoMonomorphismRestriction
                        ScopedTypeVariables
diff --git a/hackage-repo-tool/src/Hackage/Security/RepoTool/Util/IO.hs b/hackage-repo-tool/src/Hackage/Security/RepoTool/Util/IO.hs
@@ -17,7 +17,6 @@ import qualified Codec.Archive.Tar.Entry           as Tar
 import qualified Codec.Compression.GZip            as GZip
 import           Control.Exception
 import qualified Data.ByteString.Lazy              as BS.L
-import           Data.Typeable
 import qualified System.Directory                  as Directory
 import           System.IO.Error
 
@@ -111,7 +110,6 @@ tarExtractFile opts repoLoc pathTarGz pathToExtract =
                 go es
 
 data TarGzError = TarGzError FilePath SomeException
-  deriving (Typeable)
 
 instance Exception TarGzError where
   displayException (TarGzError path e) = path ++ ": " ++ displayException e
diff --git a/hackage-security-HTTP/hackage-security-HTTP.cabal b/hackage-security-HTTP/hackage-security-HTTP.cabal
@@ -50,8 +50,7 @@ library
                        hackage-security >= 0.5       && < 0.7
   hs-source-dirs:      src
   default-language:    Haskell2010
-  default-extensions:  DeriveDataTypeable
-                       FlexibleContexts
+  default-extensions:  FlexibleContexts
                        RankNTypes
                        RecordWildCards
                        ScopedTypeVariables
diff --git a/hackage-security-HTTP/src/Hackage/Security/Client/Repository/HttpLib/HTTP.hs b/hackage-security-HTTP/src/Hackage/Security/Client/Repository/HttpLib/HTTP.hs
@@ -18,7 +18,6 @@ import Control.Concurrent
 import Control.Exception
 import Control.Monad
 import Data.List (intercalate)
-import Data.Typeable (Typeable)
 import Network.URI
 import qualified Data.ByteString.Lazy as BS.L
 import qualified Control.Monad.State  as State
@@ -120,10 +119,8 @@ wrapCustomEx act = handleChecked (\(ex :: UnexpectedResponse) -> go ex)
     go ex = throwChecked (SomeRemoteError ex)
 
 data UnexpectedResponse = UnexpectedResponse URI (Int, Int, Int)
-  deriving (Typeable)
 
 data InvalidProxy = InvalidProxy String
-  deriving (Typeable)
 
 instance Pretty UnexpectedResponse where
   pretty (UnexpectedResponse uri code) = "Unexpected response " ++ show code
diff --git a/hackage-security/src/Hackage/Security/Client.hs b/hackage-security/src/Hackage/Security/Client.hs
@@ -49,7 +49,6 @@ import Data.Maybe (isNothing)
 import Data.Ord (comparing)
 import Data.Time
 import Data.Traversable (for)
-import Data.Typeable (Typeable)
 import qualified Codec.Archive.Tar          as Tar
 import qualified Codec.Archive.Tar.Entry    as Tar
 import qualified Codec.Archive.Tar.Index    as Tar
@@ -931,17 +930,14 @@ uncheckClientErrors act = handleChecked rethrowVerificationError
      rethrowInvalidPackageException = throwIO
 
 data InvalidPackageException = InvalidPackageException PackageIdentifier
-  deriving (Typeable)
 
 data LocalFileCorrupted = LocalFileCorrupted DeserializationError
-  deriving (Typeable)
 
 data InvalidFileInIndex = forall dec. InvalidFileInIndex {
     invalidFileInIndex      :: IndexFile dec
   , invalidFileInIndexRaw   :: BS.L.ByteString
   , invalidFileInIndexError :: DeserializationError
   }
-  deriving (Typeable)
 
 deriving instance Show InvalidPackageException
 deriving instance Show LocalFileCorrupted
diff --git a/hackage-security/src/Hackage/Security/Client/Repository.hs b/hackage-security/src/Hackage/Security/Client/Repository.hs
@@ -33,7 +33,6 @@ module Hackage.Security.Client.Repository (
 import Prelude
 import Control.Exception
 import Data.Kind (Type)
-import Data.Typeable (Typeable)
 import qualified Codec.Archive.Tar.Index as Tar
 import qualified Data.ByteString.Lazy    as BS.L
 
@@ -384,7 +383,6 @@ class DownloadedFile (down :: Type -> Type) where
 -- for local repositories this might correspond to file-not-found, etc.
 data SomeRemoteError :: Type where
     SomeRemoteError :: Exception e => e -> SomeRemoteError
-  deriving (Typeable)
 
 deriving instance Show SomeRemoteError
 instance Exception SomeRemoteError where displayException = pretty
diff --git a/hackage-security/src/Hackage/Security/Client/Repository/Remote.hs b/hackage-security/src/Hackage/Security/Client/Repository/Remote.hs
@@ -34,7 +34,6 @@ import Control.Monad (when, unless)
 import Control.Monad.IO.Class (MonadIO)
 import Data.Kind (Type)
 import Data.List (nub, intercalate)
-import Data.Typeable
 import Network.URI hiding (uriPath, path)
 import System.IO ()
 import qualified Data.ByteString      as BS
@@ -486,7 +485,6 @@ data FileTooLarge = FileTooLarge {
     fileTooLargePath     :: TargetPath
   , fileTooLargeExpected :: FileSize
   }
-  deriving (Typeable)
 
 instance Pretty FileTooLarge where
   pretty FileTooLarge{..} = concat [
diff --git a/hackage-security/src/Hackage/Security/JSON.hs b/hackage-security/src/Hackage/Security/JSON.hs
@@ -45,7 +45,6 @@ import Control.Monad (unless, liftM)
 import Control.Monad.Except (MonadError, Except, ExceptT, runExcept, runExceptT, throwError)
 import Control.Monad.Reader (MonadReader, Reader, runReader, local, ask)
 import Data.Functor.Identity
-import Data.Typeable (Typeable)
 import qualified Data.ByteString.Lazy as BS.L
 
 import Hackage.Security.Key
@@ -82,7 +81,6 @@ data DeserializationError =
     --
     -- Records actual and expected types.
   | DeserializationErrorFileType String String
-  deriving (Typeable)
 
 deriving instance Show DeserializationError
 instance Exception DeserializationError where displayException = pretty
diff --git a/hackage-security/src/Hackage/Security/Key.hs b/hackage-security/src/Hackage/Security/Key.hs
@@ -28,7 +28,6 @@ module Hackage.Security.Key (
 import Prelude
 import Control.Monad
 import Data.Functor.Identity
-import Data.Typeable (Typeable)
 import Text.JSON.Canonical
 import qualified Crypto.Hash.SHA256   as SHA256
 import qualified Crypto.Sign.Ed25519  as Ed25519
@@ -50,15 +49,12 @@ data Ed25519
 
 data Key a where
     KeyEd25519 :: Ed25519.PublicKey -> Ed25519.SecretKey -> Key Ed25519
-  deriving (Typeable)
 
 data PublicKey a where
     PublicKeyEd25519 :: Ed25519.PublicKey -> PublicKey Ed25519
-  deriving (Typeable)
 
 data PrivateKey a where
     PrivateKeyEd25519 :: Ed25519.SecretKey -> PrivateKey Ed25519
-  deriving (Typeable)
 
 deriving instance Show (Key        typ)
 deriving instance Show (PublicKey  typ)
diff --git a/hackage-security/src/Hackage/Security/TUF/Header.hs b/hackage-security/src/Hackage/Security/TUF/Header.hs
@@ -14,7 +14,6 @@ module Hackage.Security.TUF.Header (
 
 import Prelude
 import Data.Time
-import Data.Typeable (Typeable)
 
 import Hackage.Security.JSON
 import Hackage.Security.Util.Lens
@@ -38,7 +37,7 @@ class HasHeader a where
 -- 'Show' and 'Read' instance are defined in terms of the underlying 'Int'
 -- (this is used for example by Hackage during the backup process).
 newtype FileVersion = FileVersion Int54
-  deriving (Eq, Ord, Typeable)
+  deriving (Eq, Ord)
 
 instance Show FileVersion where
   show (FileVersion v) = show v
@@ -53,7 +52,7 @@ instance Read FileVersion where
 -- allows that, because you could set an expiry date 2000 years into the future.
 -- By having the Maybe here we avoid the _need_ for such encoding issues.)
 newtype FileExpires = FileExpires (Maybe UTCTime)
-  deriving (Eq, Ord, Show, Typeable)
+  deriving (Eq, Ord, Show)
 
 -- | Occasionally it is useful to read only a header from a file.
 --
diff --git a/hackage-security/src/Hackage/Security/Trusted/TCB.hs b/hackage-security/src/Hackage/Security/Trusted/TCB.hs
@@ -23,7 +23,6 @@ import Prelude
 import Control.Exception
 import Control.Monad (when, unless)
 import Control.Monad.Except (Except, runExcept, throwError)
-import Data.Typeable
 import Data.Time
 import Hackage.Security.TUF
 import Hackage.Security.JSON
@@ -184,11 +183,9 @@ data VerificationError =
      --
      -- We record all verification errors that occurred before we gave up.
    | VerificationErrorLoop VerificationHistory
-   deriving (Typeable)
 
 -- | Root metadata updated (as part of the normal update process)
 data RootUpdated = RootUpdated
-  deriving (Typeable)
 
 type VerificationHistory = [Either RootUpdated VerificationError]
 
diff --git a/hackage-security/src/Hackage/Security/Util/Checked.hs b/hackage-security/src/Hackage/Security/Util/Checked.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE DeriveDataTypeable  #-}
 {-# LANGUAGE IncoherentInstances #-}
 {-# LANGUAGE RoleAnnotations     #-}
 
@@ -22,7 +21,6 @@ module Hackage.Security.Util.Checked (
 import Prelude
 import Control.Exception (Exception, IOException)
 import qualified Control.Exception as Base
-import Data.Typeable (Typeable)
 
 import GHC.Prim (coerce)
 
@@ -59,7 +57,7 @@ catchSync act onErr = act `Base.catch` \e ->
 
 -- | Wraps up an async exception as a synchronous exception.
 newtype SyncException = SyncException Base.SomeException
-  deriving (Show, Typeable)
+  deriving (Show)
 instance Exception SyncException
 
 -- | Throw a checked exception
diff --git a/hackage-security/src/Hackage/Security/Util/Some.hs b/hackage-security/src/Hackage/Security/Util/Some.hs
@@ -15,15 +15,12 @@ module Hackage.Security.Util.Some (
   ) where
 
 import Prelude
-import Data.Typeable (Typeable)
 
 import Hackage.Security.Util.TypedEmbedded
 import Hackage.Security.Util.Pretty
 
 data Some f = forall a. Some (f a)
 
-deriving instance Typeable Some
-
 {-------------------------------------------------------------------------------
   Equality on Some types
 
diff --git a/hackage-security/src/Text/JSON/Canonical.hs b/hackage-security/src/Text/JSON/Canonical.hs
@@ -43,7 +43,6 @@ import Data.Function (on)
 import Data.Int (Int64)
 import Data.Ix (Ix)
 import Data.List (foldl', sortBy)
-import Data.Typeable (Typeable)
 import Foreign.Storable (Storable)
 import Text.Printf (PrintfArg)
 import qualified Data.ByteString.Lazy.Char8 as BS
@@ -79,7 +78,6 @@ newtype Int54 = Int54 { int54ToInt64 :: Int64 }
            , Bits
            , Storable
            , PrintfArg
-           , Typeable
            )
 
 instance Bounded Int54 where
