haskell · Mikolaj · Jan 29, 2022 · Jan 29, 2022
diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal
@@ -113,7 +113,7 @@ library
                        Hackage.Security.Util.Lens
                        Hackage.Security.Util.Stack
                        Hackage.Security.Util.TypedEmbedded
-                       Prelude
+                       MyPrelude
   -- We support ghc 7.4 (bundled with Cabal 1.14) and up
   build-depends:       base              >= 4.5     && < 4.17,
                        base16-bytestring >= 0.1.1   && < 1.1,
@@ -171,6 +171,7 @@ library
                        KindSignatures
                        MultiParamTypeClasses
                        NamedFieldPuns
+                       NoImplicitPrelude
                        NoMonomorphismRestriction
                        RankNTypes
                        RecordWildCards

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 Prelude hiding (log)
+import MyPrelude 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,6 +17,7 @@ module Hackage.Security.Client.Formats (
   , formatsLookup
   ) where
 
+import MyPrelude
 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,6 +30,7 @@ module Hackage.Security.Client.Repository (
   , mustCache
   ) where
 
+import MyPrelude
 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,6 +15,7 @@ module Hackage.Security.Client.Repository.Cache (
   , lockCacheWithLogger
   ) where
 
+import MyPrelude
 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,6 +11,7 @@ module Hackage.Security.Client.Repository.HttpLib (
   , bodyReaderFromBS
   ) where
 
+import MyPrelude
 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,6 +5,7 @@ module Hackage.Security.Client.Repository.Local (
   , withRepository
   ) where
 
+import MyPrelude
 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,6 +27,7 @@ module Hackage.Security.Client.Repository.Remote (
   , fileSizeWithinBounds
   ) where
 
+import MyPrelude
 import Control.Concurrent
 import Control.Exception
 import Control.Monad.Cont

diff --git a/hackage-security/src/Hackage/Security/Client/Verify.hs b/hackage-security/src/Hackage/Security/Client/Verify.hs
@@ -10,6 +10,7 @@ module Hackage.Security.Client.Verify (
   , liftIO
   ) where
 
+import MyPrelude
 import Control.Exception
 import Control.Monad.Reader
 import Data.IORef

diff --git a/hackage-security/src/Hackage/Security/JSON.hs b/hackage-security/src/Hackage/Security/JSON.hs
@@ -38,6 +38,7 @@ module Hackage.Security.JSON (
   , module Hackage.Security.Util.JSON
   ) where
 
+import MyPrelude
 import Control.Arrow (first, second)
 import Control.Exception
 import Control.Monad.Except

diff --git a/hackage-security/src/Hackage/Security/Key.hs b/hackage-security/src/Hackage/Security/Key.hs
@@ -25,6 +25,7 @@ module Hackage.Security.Key (
   , verify
   ) where
 
+import MyPrelude
 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 Prelude hiding (lookup, null)
+import MyPrelude 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,6 +6,7 @@ module Hackage.Security.TUF.Common (
   , KeyThreshold(..)
   ) where
 
+import MyPrelude
 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 Prelude hiding (lookup)
+import MyPrelude 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 Prelude hiding (lookup)
+import MyPrelude 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,6 +12,7 @@ module Hackage.Security.TUF.Header (
   , versionIncrement
   ) where
 
+import MyPrelude
 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,6 +4,7 @@ module Hackage.Security.TUF.Layout.Cache (
   , cabalCacheLayout
   ) where
 
+import MyPrelude
 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,6 +9,7 @@ module Hackage.Security.TUF.Layout.Index (
   , indexLayoutPkgPrefs
   ) where
 
+import MyPrelude
 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,6 +5,7 @@ module Hackage.Security.TUF.Layout.Repo (
   , cabalLocalRepoLayout
   ) where
 
+import MyPrelude
 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,6 +9,7 @@ module Hackage.Security.TUF.Mirrors (
   , describeMirror
   ) where
 
+import MyPrelude
 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,6 +14,7 @@ module Hackage.Security.TUF.Paths (
   , anchorCachePath
   ) where
 
+import MyPrelude
 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,6 +26,7 @@ module Hackage.Security.TUF.Patterns (
   , qqd
   ) where
 
+import MyPrelude
 import Control.Monad.Except
 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,6 +6,7 @@ module Hackage.Security.TUF.Root (
   , RoleSpec(..)
   ) where
 
+import MyPrelude
 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,6 +27,7 @@ module Hackage.Security.TUF.Signed (
   , toPreSignatures
   ) where
 
+import MyPrelude
 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,6 +3,7 @@ module Hackage.Security.TUF.Snapshot (
     Snapshot(..)
   ) where
 
+import MyPrelude
 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,6 +8,7 @@ module Hackage.Security.TUF.Targets (
   , targetsLookup
   ) where
 
+import MyPrelude
 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,6 +3,7 @@ module Hackage.Security.TUF.Timestamp (
     Timestamp(..)
   ) where
 
+import MyPrelude
 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,6 +12,7 @@ module Hackage.Security.Trusted (
   , trustedFileInfoEqual
   ) where
 
+import MyPrelude
 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,6 +26,7 @@ module Hackage.Security.Trusted.TCB (
 #endif
   ) where
 
+import MyPrelude
 import Control.Exception
 import Control.Monad.Except
 import Data.Typeable

diff --git a/hackage-security/src/Hackage/Security/Util/Base64.hs b/hackage-security/src/Hackage/Security/Util/Base64.hs
@@ -4,6 +4,7 @@ module Hackage.Security.Util.Base64 (
   , toByteString
   ) where
 
+import MyPrelude
 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
@@ -25,6 +25,7 @@ module Hackage.Security.Util.Checked (
   , internalError
   ) where
 
+import MyPrelude
 import Control.Exception (Exception, IOException)
 import qualified Control.Exception as Base
 import Data.Typeable (Typeable)

diff --git a/hackage-security/src/Hackage/Security/Util/Exit.hs b/hackage-security/src/Hackage/Security/Util/Exit.hs
@@ -1,5 +1,6 @@
 module Hackage.Security.Util.Exit where
 
+import MyPrelude
 import Control.Monad.Except
 
 {-------------------------------------------------------------------------------

diff --git a/hackage-security/src/Hackage/Security/Util/IO.hs b/hackage-security/src/Hackage/Security/Util/IO.hs
@@ -9,6 +9,7 @@ module Hackage.Security.Util.IO (
   , timedIO
   ) where
 
+import MyPrelude
 import Control.Concurrent (threadDelay)
 import Control.Exception
 import Data.Time

diff --git a/hackage-security/src/Hackage/Security/Util/JSON.hs b/hackage-security/src/Hackage/Security/Util/JSON.hs
@@ -23,6 +23,7 @@ module Hackage.Security.Util.JSON (
   , Int54
   ) where
 
+import MyPrelude
 import Control.Monad (liftM)
 import Data.Maybe (catMaybes)
 import Data.Map (Map)

diff --git a/hackage-security/src/Hackage/Security/Util/Lens.hs b/hackage-security/src/Hackage/Security/Util/Lens.hs
@@ -14,6 +14,7 @@ module Hackage.Security.Util.Lens (
   , set
   ) where
 
+import MyPrelude
 import Control.Applicative
 import Data.Functor.Identity
 

diff --git a/hackage-security/src/Hackage/Security/Util/Path.hs b/hackage-security/src/Hackage/Security/Util/Path.hs
@@ -83,6 +83,7 @@ module Hackage.Security.Util.Path (
   , IO.hSeek
   ) where
 
+import MyPrelude
 import Control.Monad
 import Data.List (isPrefixOf)
 import System.IO (IOMode(..), BufferMode(..), Handle, SeekMode(..))

diff --git a/hackage-security/src/Hackage/Security/Util/Pretty.hs b/hackage-security/src/Hackage/Security/Util/Pretty.hs
@@ -3,6 +3,8 @@ module Hackage.Security.Util.Pretty (
     Pretty(..)
   ) where
 
+import MyPrelude
+
 -- | Produce a human-readable string
 class Pretty a where
   pretty :: a -> String
diff --git a/hackage-security/src/Hackage/Security/Util/Some.hs b/hackage-security/src/Hackage/Security/Util/Some.hs
@@ -19,6 +19,7 @@ module Hackage.Security.Util.Some (
 #endif
   ) where
 
+import MyPrelude
 #if MIN_VERSION_base(4,7,0)
 import Data.Typeable (Typeable)
 #else

diff --git a/hackage-security/src/Hackage/Security/Util/Stack.hs b/hackage-security/src/Hackage/Security/Util/Stack.hs
@@ -3,6 +3,8 @@ module Hackage.Security.Util.Stack (
     (:-)(..)
   ) where
 
+import MyPrelude
+
 data h :- t = h :- t
   deriving (Eq, Show)
 infixr 5 :-
diff --git a/hackage-security/src/Hackage/Security/Util/TypedEmbedded.hs b/hackage-security/src/Hackage/Security/Util/TypedEmbedded.hs
@@ -7,6 +7,8 @@ module Hackage.Security.Util.TypedEmbedded (
   , AsType(..)
   ) where
 
+import MyPrelude
+
 -- | Type equality proofs
 --
 -- This is a direct copy of "type-equality:Data.Type.Equality"; if we don't

diff --git a/hackage-security/src/Prelude.hs → hackage-security/src/MyPrelude.hs b/hackage-security/src/Prelude.hs → hackage-security/src/MyPrelude.hs
@@ -1,8 +1,7 @@
 -- | Smooth over differences between various ghc versions by making older
 -- preludes look like 4.8.0
-{-# LANGUAGE PackageImports #-}
 {-# LANGUAGE CPP #-}
-module Prelude (
+module MyPrelude (
     module P
 #if !MIN_VERSION_base(4,8,0)
   , Applicative(..)
@@ -15,12 +14,12 @@ module Prelude (
   ) where
 
 #if MIN_VERSION_base(4,8,0)
-import "base" Prelude as P
+import Prelude as P
 #else
 #if MIN_VERSION_base(4,6,0)
-import "base" Prelude as P
+import Prelude as P
 #else
-import "base" Prelude as P hiding (catch)
+import Prelude as P hiding (catch)
 #endif
 import Control.Applicative
 import Control.Exception (Exception)

diff --git a/hackage-security/src/Text/JSON/Canonical.hs b/hackage-security/src/Text/JSON/Canonical.hs
@@ -30,6 +30,7 @@ module Text.JSON.Canonical
   , prettyCanonicalJSON
   ) where
 
+import MyPrelude
 import Text.ParserCombinators.Parsec
          ( CharParser, (<|>), (<?>), many, between, sepBy
          , satisfy, char, string, digit, spaces
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,6 +14,7 @@ module Hackage.Security.Util.Lens ( @@
       , set
       ) where
+    import MyPrelude
     import Control.Applicative
     import Data.Functor.Identity
@@ Expand Down @@