Require base >= 4.8, drop custom preludes

andreasabel · andreasabel · commit fd748e2fd260 · 2024-01-09T06:38:07.000+01:00
The custom preludes simulated the Prelude of base-4.8, which is now
present always; thus, they are obsolete.
diff --git a/example-client/example-client.cabal b/example-client/example-client.cabal
@@ -36,9 +36,9 @@ flag Cabal-syntax
 
 executable example-client
   main-is:             Main.hs
-  other-modules: Prelude ExampleClient.Options
+  other-modules:       ExampleClient.Options
 
-  build-depends:       base                 >= 4.5 && < 4.20,
+  build-depends:       base                 >= 4.8 && < 4.20,
                        bytestring           >= 0.9,
                        directory            >= 1.1,
                        filepath             >= 1.2,
diff --git a/example-client/src/Prelude.hs b/example-client/src/Prelude.hs
diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal
@@ -65,11 +65,10 @@ executable hackage-repo-tool
                        Hackage.Security.RepoTool.Layout.Keys
                        Hackage.Security.RepoTool.Paths
                        Hackage.Security.RepoTool.Util.IO
-                       Prelude
 
   -- For boot libraries we try to accomodate the versions bundled with
   -- the respective GHC release
-  build-depends:       base                 >= 4.5  && < 4.20,
+  build-depends:       base                 >= 4.8  && < 4.20,
                        bytestring           >= 0.9  && < 0.13,
                        directory            >= 1.1  && < 1.4,
                        filepath             >= 1.3  && < 1.5,
diff --git a/hackage-repo-tool/src/Prelude.hs b/hackage-repo-tool/src/Prelude.hs
diff --git a/hackage-root-tool/hackage-root-tool.cabal b/hackage-root-tool/hackage-root-tool.cabal
@@ -39,7 +39,7 @@ source-repository head
 
 executable hackage-root-tool
   main-is:             Main.hs
-  build-depends:       base                 >= 4.4  && < 5,
+  build-depends:       base                 >= 4.8  && < 5,
                        filepath             >= 1.2  && < 1.5,
                        optparse-applicative >= 0.11 && < 0.18,
                        hackage-security     >= 0.5  && < 0.7
diff --git a/hackage-security-HTTP/hackage-security-HTTP.cabal b/hackage-security-HTTP/hackage-security-HTTP.cabal
@@ -44,7 +44,7 @@ flag use-network-uri
 
 library
   exposed-modules:     Hackage.Security.Client.Repository.HttpLib.HTTP
-  build-depends:       base             >= 4.5       && < 4.20,
+  build-depends:       base             >= 4.8       && < 4.20,
                        bytestring       >= 0.9       && < 0.13,
                        HTTP             >= 4000.2.19 && < 4000.5,
                        mtl              >= 2.1       && < 2.4,
diff --git a/hackage-security-curl/hackage-security-curl.cabal b/hackage-security-curl/hackage-security-curl.cabal
@@ -35,7 +35,7 @@ flag use-network-uri
 
 library
   exposed-modules:     Hackage.Security.Client.Repository.HttpLib.Curl
-  build-depends:       base        >= 4.5 && < 4.20,
+  build-depends:       base        >= 4.8 && < 4.20,
                        bytestring  >= 0.9,
                        process     >= 1.1,
                        hackage-security
diff --git a/hackage-security-http-client/hackage-security-http-client.cabal b/hackage-security-http-client/hackage-security-http-client.cabal
@@ -34,7 +34,7 @@ flag use-network-uri
 
 library
   exposed-modules:     Hackage.Security.Client.Repository.HttpLib.HttpClient
-  build-depends:       base               >= 4.5 && < 4.20,
+  build-depends:       base               >= 4.8 && < 4.20,
                        bytestring         >= 0.9,
                        http-client        >= 0.4 && < 0.8,
                        http-types         >= 0.8,
diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal
@@ -110,8 +110,7 @@ library
                        Hackage.Security.Util.Lens
                        Hackage.Security.Util.Stack
                        Hackage.Security.Util.TypedEmbedded
-                       MyPrelude
-  -- We support ghc 7.4 (bundled with Cabal 1.14) and up
+
   build-depends:       base              >= 4.8     && < 4.20,
                          -- PatternSynonyms are only available since GHC 7.8 (base 4.7)
                        base16-bytestring >= 0.1.1   && < 1.1,
diff --git a/hackage-security/src/Hackage/Security/Client.hs b/hackage-security/src/Hackage/Security/Client.hs
@@ -41,7 +41,7 @@ module Hackage.Security.Client (
   , LocalFileCorrupted(..)
   ) where
 
-import MyPrelude hiding (log)
+import Prelude hiding (log)
 import Control.Arrow (first)
 import Control.Exception
 import Control.Monad
diff --git a/hackage-security/src/Hackage/Security/Client/Formats.hs b/hackage-security/src/Hackage/Security/Client/Formats.hs
@@ -17,7 +17,7 @@ module Hackage.Security.Client.Formats (
   , formatsLookup
   ) where
 
-import MyPrelude
+import Prelude
 import Hackage.Security.Util.Stack
 import Hackage.Security.Util.TypedEmbedded
 
diff --git a/hackage-security/src/Hackage/Security/Client/Repository.hs b/hackage-security/src/Hackage/Security/Client/Repository.hs
@@ -30,7 +30,7 @@ module Hackage.Security.Client.Repository (
   , mustCache
   ) where
 
-import MyPrelude
+import Prelude
 import Control.Exception
 import Data.Typeable (Typeable)
 import qualified Codec.Archive.Tar.Index as Tar
diff --git a/hackage-security/src/Hackage/Security/Client/Repository/Cache.hs b/hackage-security/src/Hackage/Security/Client/Repository/Cache.hs
@@ -15,7 +15,7 @@ module Hackage.Security.Client.Repository.Cache (
   , lockCacheWithLogger
   ) where
 
-import MyPrelude
+import Prelude
 import Control.Exception
 import Control.Monad
 import Control.Monad.IO.Class
diff --git a/hackage-security/src/Hackage/Security/Client/Repository/HttpLib.hs b/hackage-security/src/Hackage/Security/Client/Repository/HttpLib.hs
@@ -11,7 +11,7 @@ module Hackage.Security.Client.Repository.HttpLib (
   , bodyReaderFromBS
   ) where
 
-import MyPrelude
+import Prelude
 import Data.IORef
 import Network.URI hiding (uriPath, path)
 import qualified Data.ByteString      as BS
diff --git a/hackage-security/src/Hackage/Security/Client/Repository/Local.hs b/hackage-security/src/Hackage/Security/Client/Repository/Local.hs
@@ -5,7 +5,7 @@ module Hackage.Security.Client.Repository.Local (
   , withRepository
   ) where
 
-import MyPrelude
+import Prelude
 import Hackage.Security.Client.Formats
 import Hackage.Security.Client.Repository
 import Hackage.Security.Client.Repository.Cache
diff --git a/hackage-security/src/Hackage/Security/Client/Repository/Remote.hs b/hackage-security/src/Hackage/Security/Client/Repository/Remote.hs
@@ -27,7 +27,7 @@ module Hackage.Security.Client.Repository.Remote (
   , fileSizeWithinBounds
   ) where
 
-import MyPrelude
+import Prelude
 import Control.Concurrent
 import Control.Exception
 import Control.Monad (when, unless)
@@ -687,4 +687,3 @@ verifyRemoteFile remoteTemp trustedInfo = do
                 BS.L.take (fromIntegral deltaSeek) existing
               , temp
               ]
-
diff --git a/hackage-security/src/Hackage/Security/Client/Verify.hs b/hackage-security/src/Hackage/Security/Client/Verify.hs
@@ -10,7 +10,7 @@ module Hackage.Security.Client.Verify (
   , liftIO
   ) where
 
-import MyPrelude
+import Prelude
 import Control.Exception
 import Control.Monad (join, void)
 import Control.Monad.IO.Class (MonadIO, liftIO)
diff --git a/hackage-security/src/Hackage/Security/JSON.hs b/hackage-security/src/Hackage/Security/JSON.hs
@@ -38,7 +38,7 @@ module Hackage.Security.JSON (
   , module Hackage.Security.Util.JSON
   ) where
 
-import MyPrelude
+import Prelude
 import Control.Arrow (first, second)
 import Control.Exception
 import Control.Monad (unless, liftM)
diff --git a/hackage-security/src/Hackage/Security/Key.hs b/hackage-security/src/Hackage/Security/Key.hs
@@ -25,7 +25,7 @@ module Hackage.Security.Key (
   , verify
   ) where
 
-import MyPrelude
+import Prelude
 import Control.Monad
 import Data.Functor.Identity
 import Data.Typeable (Typeable)
diff --git a/hackage-security/src/Hackage/Security/Key/Env.hs b/hackage-security/src/Hackage/Security/Key/Env.hs
@@ -12,7 +12,7 @@ module Hackage.Security.Key.Env (
   , union
   ) where
 
-import MyPrelude hiding (lookup, null)
+import Prelude hiding (lookup, null)
 import Control.Monad
 import Data.Map (Map)
 import qualified Data.Map as Map
diff --git a/hackage-security/src/Hackage/Security/TUF/Common.hs b/hackage-security/src/Hackage/Security/TUF/Common.hs
@@ -6,7 +6,7 @@ module Hackage.Security.TUF.Common (
   , KeyThreshold(..)
   ) where
 
-import MyPrelude
+import Prelude
 import Hackage.Security.JSON
 
 {-------------------------------------------------------------------------------
diff --git a/hackage-security/src/Hackage/Security/TUF/FileInfo.hs b/hackage-security/src/Hackage/Security/TUF/FileInfo.hs
@@ -13,7 +13,7 @@ module Hackage.Security.TUF.FileInfo (
   , Int54
   ) where
 
-import MyPrelude hiding (lookup)
+import Prelude hiding (lookup)
 import Data.Map (Map)
 import qualified Crypto.Hash.SHA256   as SHA256
 import qualified Data.Map             as Map
diff --git a/hackage-security/src/Hackage/Security/TUF/FileMap.hs b/hackage-security/src/Hackage/Security/TUF/FileMap.hs
@@ -18,7 +18,7 @@ module Hackage.Security.TUF.FileMap (
   , fileMapChanges
   ) where
 
-import MyPrelude hiding (lookup)
+import Prelude hiding (lookup)
 import Control.Arrow (second)
 import Data.Map (Map)
 import qualified Data.Map as Map
diff --git a/hackage-security/src/Hackage/Security/TUF/Header.hs b/hackage-security/src/Hackage/Security/TUF/Header.hs
@@ -12,7 +12,7 @@ module Hackage.Security.TUF.Header (
   , versionIncrement
   ) where
 
-import MyPrelude
+import Prelude
 import Data.Time
 import Data.Typeable (Typeable)
 
diff --git a/hackage-security/src/Hackage/Security/TUF/Layout/Cache.hs b/hackage-security/src/Hackage/Security/TUF/Layout/Cache.hs
@@ -4,7 +4,7 @@ module Hackage.Security.TUF.Layout.Cache (
   , cabalCacheLayout
   ) where
 
-import MyPrelude
+import Prelude
 import Hackage.Security.TUF.Paths
 import Hackage.Security.Util.Path
 
diff --git a/hackage-security/src/Hackage/Security/TUF/Layout/Index.hs b/hackage-security/src/Hackage/Security/TUF/Layout/Index.hs
@@ -9,7 +9,7 @@ module Hackage.Security.TUF.Layout.Index (
   , indexLayoutPkgPrefs
   ) where
 
-import MyPrelude
+import Prelude
 import Distribution.Package
 import Distribution.Text
 
diff --git a/hackage-security/src/Hackage/Security/TUF/Layout/Repo.hs b/hackage-security/src/Hackage/Security/TUF/Layout/Repo.hs
@@ -5,7 +5,7 @@ module Hackage.Security.TUF.Layout.Repo (
   , cabalLocalRepoLayout
   ) where
 
-import MyPrelude
+import Prelude
 import Distribution.Package
 import Distribution.Text
 
diff --git a/hackage-security/src/Hackage/Security/TUF/Mirrors.hs b/hackage-security/src/Hackage/Security/TUF/Mirrors.hs
@@ -9,7 +9,7 @@ module Hackage.Security.TUF.Mirrors (
   , describeMirror
   ) where
 
-import MyPrelude
+import Prelude
 import Control.Monad.Except
 import Network.URI
 
diff --git a/hackage-security/src/Hackage/Security/TUF/Paths.hs b/hackage-security/src/Hackage/Security/TUF/Paths.hs
@@ -14,7 +14,7 @@ module Hackage.Security.TUF.Paths (
   , anchorCachePath
   ) where
 
-import MyPrelude
+import Prelude
 import Hackage.Security.Util.Path
 import Hackage.Security.Util.Pretty
 
diff --git a/hackage-security/src/Hackage/Security/TUF/Patterns.hs b/hackage-security/src/Hackage/Security/TUF/Patterns.hs
@@ -26,7 +26,7 @@ module Hackage.Security.TUF.Patterns (
   , qqd
   ) where
 
-import MyPrelude
+import Prelude
 import Control.Monad (guard)
 import Language.Haskell.TH (Q, Exp)
 import System.FilePath.Posix
diff --git a/hackage-security/src/Hackage/Security/TUF/Root.hs b/hackage-security/src/Hackage/Security/TUF/Root.hs
@@ -6,7 +6,7 @@ module Hackage.Security.TUF.Root (
   , RoleSpec(..)
   ) where
 
-import MyPrelude
+import Prelude
 import Hackage.Security.JSON
 import Hackage.Security.Key
 import Hackage.Security.Key.Env (KeyEnv)
diff --git a/hackage-security/src/Hackage/Security/TUF/Signed.hs b/hackage-security/src/Hackage/Security/TUF/Signed.hs
@@ -27,7 +27,7 @@ module Hackage.Security.TUF.Signed (
   , toPreSignatures
   ) where
 
-import MyPrelude
+import Prelude
 import Control.Monad
 import Data.Functor.Identity
 import qualified Data.ByteString      as BS
diff --git a/hackage-security/src/Hackage/Security/TUF/Snapshot.hs b/hackage-security/src/Hackage/Security/TUF/Snapshot.hs
@@ -3,7 +3,7 @@ module Hackage.Security.TUF.Snapshot (
     Snapshot(..)
   ) where
 
-import MyPrelude
+import Prelude
 import Control.Monad.Except
 import Control.Monad.Reader
 
diff --git a/hackage-security/src/Hackage/Security/TUF/Targets.hs b/hackage-security/src/Hackage/Security/TUF/Targets.hs
@@ -8,7 +8,7 @@ module Hackage.Security.TUF.Targets (
   , targetsLookup
   ) where
 
-import MyPrelude
+import Prelude
 import Hackage.Security.JSON
 import Hackage.Security.Key
 import Hackage.Security.Key.Env (KeyEnv)
diff --git a/hackage-security/src/Hackage/Security/TUF/Timestamp.hs b/hackage-security/src/Hackage/Security/TUF/Timestamp.hs
@@ -3,7 +3,7 @@ module Hackage.Security.TUF.Timestamp (
     Timestamp(..)
   ) where
 
-import MyPrelude
+import Prelude
 import Control.Monad.Except
 import Control.Monad.Reader
 
diff --git a/hackage-security/src/Hackage/Security/Trusted.hs b/hackage-security/src/Hackage/Security/Trusted.hs
@@ -12,7 +12,7 @@ module Hackage.Security.Trusted (
   , trustedFileInfoEqual
   ) where
 
-import MyPrelude
+import Prelude
 import Data.Function (on)
 import Data.Time
 import Hackage.Security.TUF
diff --git a/hackage-security/src/Hackage/Security/Trusted/TCB.hs b/hackage-security/src/Hackage/Security/Trusted/TCB.hs
@@ -26,7 +26,7 @@ module Hackage.Security.Trusted.TCB (
 #endif
   ) where
 
-import MyPrelude
+import Prelude
 import Control.Exception
 import Control.Monad (when, unless)
 import Control.Monad.Except (Except, runExcept, throwError)
diff --git a/hackage-security/src/Hackage/Security/Util/Base64.hs b/hackage-security/src/Hackage/Security/Util/Base64.hs
@@ -4,7 +4,7 @@ module Hackage.Security.Util.Base64 (
   , toByteString
   ) where
 
-import MyPrelude
+import Prelude
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Char8  as C8  -- only called on B64-enc strings
 import qualified Data.ByteString.Base64 as B64
diff --git a/hackage-security/src/Hackage/Security/Util/Checked.hs b/hackage-security/src/Hackage/Security/Util/Checked.hs
diff --git a/hackage-security/src/Hackage/Security/Util/Exit.hs b/hackage-security/src/Hackage/Security/Util/Exit.hs
diff --git a/hackage-security/src/Hackage/Security/Util/IO.hs b/hackage-security/src/Hackage/Security/Util/IO.hs
diff --git a/hackage-security/src/Hackage/Security/Util/JSON.hs b/hackage-security/src/Hackage/Security/Util/JSON.hs
diff --git a/hackage-security/src/Hackage/Security/Util/Lens.hs b/hackage-security/src/Hackage/Security/Util/Lens.hs
diff --git a/hackage-security/src/Hackage/Security/Util/Path.hs b/hackage-security/src/Hackage/Security/Util/Path.hs
diff --git a/hackage-security/src/Hackage/Security/Util/Pretty.hs b/hackage-security/src/Hackage/Security/Util/Pretty.hs
diff --git a/hackage-security/src/Hackage/Security/Util/Some.hs b/hackage-security/src/Hackage/Security/Util/Some.hs
diff --git a/hackage-security/src/Hackage/Security/Util/Stack.hs b/hackage-security/src/Hackage/Security/Util/Stack.hs
diff --git a/hackage-security/src/Hackage/Security/Util/TypedEmbedded.hs b/hackage-security/src/Hackage/Security/Util/TypedEmbedded.hs
diff --git a/hackage-security/src/MyPrelude.hs b/hackage-security/src/MyPrelude.hs
diff --git a/hackage-security/src/Text/JSON/Canonical.hs b/hackage-security/src/Text/JSON/Canonical.hs
diff --git a/precompute-fileinfo/precompute-fileinfo.cabal b/precompute-fileinfo/precompute-fileinfo.cabal
