hackage-security 0.6.2.0 → 0.6.2.1

raw patch · 44 files changed

+85/−40 lines, 44 filesdep ~Cabal-syntaxPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: Cabal-syntax

API changes (from Hackage documentation)

Files

ChangeLog.md +6/−0
hackage-security.cabal +4/−3
src/Hackage/Security/Client.hs +1/−1
src/Hackage/Security/Client/Formats.hs +1/−0
src/Hackage/Security/Client/Repository.hs +1/−0
src/Hackage/Security/Client/Repository/Cache.hs +1/−0
src/Hackage/Security/Client/Repository/HttpLib.hs +1/−0
src/Hackage/Security/Client/Repository/Local.hs +1/−0
src/Hackage/Security/Client/Repository/Remote.hs +1/−0
src/Hackage/Security/Client/Verify.hs +1/−0
src/Hackage/Security/JSON.hs +1/−0
src/Hackage/Security/Key.hs +1/−0
src/Hackage/Security/Key/Env.hs +1/−1
src/Hackage/Security/TUF/Common.hs +1/−0
src/Hackage/Security/TUF/FileInfo.hs +1/−1
src/Hackage/Security/TUF/FileMap.hs +1/−1
src/Hackage/Security/TUF/Header.hs +1/−0
src/Hackage/Security/TUF/Layout/Cache.hs +1/−0
src/Hackage/Security/TUF/Layout/Index.hs +1/−0
src/Hackage/Security/TUF/Layout/Repo.hs +1/−0
src/Hackage/Security/TUF/Mirrors.hs +1/−0
src/Hackage/Security/TUF/Paths.hs +1/−0
src/Hackage/Security/TUF/Patterns.hs +1/−0
src/Hackage/Security/TUF/Root.hs +1/−0
src/Hackage/Security/TUF/Signed.hs +1/−0
src/Hackage/Security/TUF/Snapshot.hs +1/−0
src/Hackage/Security/TUF/Targets.hs +1/−0
src/Hackage/Security/TUF/Timestamp.hs +1/−0
src/Hackage/Security/Trusted.hs +1/−0
src/Hackage/Security/Trusted/TCB.hs +1/−0
src/Hackage/Security/Util/Base64.hs +1/−0
src/Hackage/Security/Util/Checked.hs +1/−0
src/Hackage/Security/Util/Exit.hs +1/−0
src/Hackage/Security/Util/IO.hs +1/−0
src/Hackage/Security/Util/JSON.hs +1/−0
src/Hackage/Security/Util/Lens.hs +1/−0
src/Hackage/Security/Util/Path.hs +2/−1
src/Hackage/Security/Util/Pretty.hs +2/−0
src/Hackage/Security/Util/Some.hs +1/−0
src/Hackage/Security/Util/Stack.hs +2/−0
src/Hackage/Security/Util/TypedEmbedded.hs +2/−0
src/MyPrelude.hs +31/−0
src/Prelude.hs +0/−32
src/Text/JSON/Canonical.hs +1/−0

ChangeLog.md view

@@ -1,5 +1,11 @@ See also http://pvp.haskell.org/faq +0.6.2.1+-------++* Allow GHC-9.0 (base-4.15) (#265)+* Fix running `cabal repl hackage-security` (#263)+ 0.6.2.0 -------

hackage-security.cabal view

@@ -1,6 +1,6 @@ cabal-version:       1.12 name:                hackage-security-version:             0.6.2.0+version:             0.6.2.1  synopsis:            Hackage security library description:         The hackage security library provides both server and@@ -113,9 +113,9 @@                        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,+  build-depends:       base              >= 4.5     && < 4.16,                        base16-bytestring >= 0.1.1   && < 1.1,                        base64-bytestring >= 1.0     && < 1.3,                        bytestring        >= 0.9     && < 0.12,@@ -171,6 +171,7 @@                        KindSignatures                        MultiParamTypeClasses                        NamedFieldPuns+                       NoImplicitPrelude                        NoMonomorphismRestriction                        RankNTypes                        RecordWildCards

src/Hackage/Security/Client.hs view

@@ -41,7 +41,7 @@   , LocalFileCorrupted(..)   ) where -import Prelude hiding (log)+import MyPrelude hiding (log) import Control.Arrow (first) import Control.Exception import Control.Monad

src/Hackage/Security/Client/Formats.hs view

@@ -17,6 +17,7 @@   , formatsLookup   ) where +import MyPrelude import Hackage.Security.Util.Stack import Hackage.Security.Util.TypedEmbedded

src/Hackage/Security/Client/Repository.hs view

@@ -30,6 +30,7 @@   , mustCache   ) where +import MyPrelude import Control.Exception import Data.Typeable (Typeable) import qualified Codec.Archive.Tar.Index as Tar

src/Hackage/Security/Client/Repository/Cache.hs view

@@ -15,6 +15,7 @@   , lockCacheWithLogger   ) where +import MyPrelude import Control.Exception import Control.Monad import Control.Monad.IO.Class

src/Hackage/Security/Client/Repository/HttpLib.hs view

@@ -11,6 +11,7 @@   , bodyReaderFromBS   ) where +import MyPrelude import Data.IORef import Network.URI hiding (uriPath, path) import qualified Data.ByteString      as BS

src/Hackage/Security/Client/Repository/Local.hs view

@@ -5,6 +5,7 @@   , withRepository   ) where +import MyPrelude import Hackage.Security.Client.Formats import Hackage.Security.Client.Repository import Hackage.Security.Client.Repository.Cache

src/Hackage/Security/Client/Repository/Remote.hs view

@@ -27,6 +27,7 @@   , fileSizeWithinBounds   ) where +import MyPrelude import Control.Concurrent import Control.Exception import Control.Monad.Cont

src/Hackage/Security/Client/Verify.hs view

@@ -10,6 +10,7 @@   , liftIO   ) where +import MyPrelude import Control.Exception import Control.Monad.Reader import Data.IORef

src/Hackage/Security/JSON.hs view

@@ -38,6 +38,7 @@   , module Hackage.Security.Util.JSON   ) where +import MyPrelude import Control.Arrow (first, second) import Control.Exception import Control.Monad.Except

src/Hackage/Security/Key.hs view

@@ -25,6 +25,7 @@   , verify   ) where +import MyPrelude import Control.Monad import Data.Functor.Identity import Data.Typeable (Typeable)

src/Hackage/Security/Key/Env.hs view

@@ -12,7 +12,7 @@   , 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

src/Hackage/Security/TUF/Common.hs view

@@ -6,6 +6,7 @@   , KeyThreshold(..)   ) where +import MyPrelude import Hackage.Security.JSON  {-------------------------------------------------------------------------------

src/Hackage/Security/TUF/FileInfo.hs view

@@ -13,7 +13,7 @@   , 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

src/Hackage/Security/TUF/FileMap.hs view

@@ -18,7 +18,7 @@   , fileMapChanges   ) where -import Prelude hiding (lookup)+import MyPrelude hiding (lookup) import Control.Arrow (second) import Data.Map (Map) import qualified Data.Map as Map

@@ -12,6 +12,7 @@   , versionIncrement   ) where +import MyPrelude import Data.Time import Data.Typeable (Typeable)

src/Hackage/Security/TUF/Layout/Cache.hs view

@@ -4,6 +4,7 @@   , cabalCacheLayout   ) where +import MyPrelude import Hackage.Security.TUF.Paths import Hackage.Security.Util.Path

src/Hackage/Security/TUF/Layout/Index.hs view

@@ -9,6 +9,7 @@   , indexLayoutPkgPrefs   ) where +import MyPrelude import Distribution.Package import Distribution.Text

src/Hackage/Security/TUF/Layout/Repo.hs view

@@ -5,6 +5,7 @@   , cabalLocalRepoLayout   ) where +import MyPrelude import Distribution.Package import Distribution.Text

src/Hackage/Security/TUF/Mirrors.hs view

@@ -9,6 +9,7 @@   , describeMirror   ) where +import MyPrelude import Control.Monad.Except import Network.URI

src/Hackage/Security/TUF/Paths.hs view

@@ -14,6 +14,7 @@   , anchorCachePath   ) where +import MyPrelude import Hackage.Security.Util.Path import Hackage.Security.Util.Pretty

src/Hackage/Security/TUF/Patterns.hs view

@@ -26,6 +26,7 @@   , qqd   ) where +import MyPrelude import Control.Monad.Except import Language.Haskell.TH (Q, Exp) import System.FilePath.Posix

src/Hackage/Security/TUF/Root.hs view

@@ -6,6 +6,7 @@   , RoleSpec(..)   ) where +import MyPrelude import Hackage.Security.JSON import Hackage.Security.Key import Hackage.Security.Key.Env (KeyEnv)

src/Hackage/Security/TUF/Signed.hs view

@@ -27,6 +27,7 @@   , toPreSignatures   ) where +import MyPrelude import Control.Monad import Data.Functor.Identity import qualified Data.ByteString      as BS

src/Hackage/Security/TUF/Snapshot.hs view

@@ -3,6 +3,7 @@     Snapshot(..)   ) where +import MyPrelude import Control.Monad.Except import Control.Monad.Reader

src/Hackage/Security/TUF/Targets.hs view

@@ -8,6 +8,7 @@   , targetsLookup   ) where +import MyPrelude import Hackage.Security.JSON import Hackage.Security.Key import Hackage.Security.Key.Env (KeyEnv)

src/Hackage/Security/TUF/Timestamp.hs view

@@ -3,6 +3,7 @@     Timestamp(..)   ) where +import MyPrelude import Control.Monad.Except import Control.Monad.Reader

src/Hackage/Security/Trusted.hs view

@@ -12,6 +12,7 @@   , trustedFileInfoEqual   ) where +import MyPrelude import Data.Function (on) import Data.Time import Hackage.Security.TUF

src/Hackage/Security/Trusted/TCB.hs view

@@ -26,6 +26,7 @@ #endif   ) where +import MyPrelude import Control.Exception import Control.Monad.Except import Data.Typeable

src/Hackage/Security/Util/Base64.hs view

@@ -4,6 +4,7 @@   , 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

src/Hackage/Security/Util/Checked.hs view

@@ -25,6 +25,7 @@   , internalError   ) where +import MyPrelude import Control.Exception (Exception, IOException) import qualified Control.Exception as Base import Data.Typeable (Typeable)

src/Hackage/Security/Util/Exit.hs view

@@ -1,5 +1,6 @@ module Hackage.Security.Util.Exit where +import MyPrelude import Control.Monad.Except  {-------------------------------------------------------------------------------

src/Hackage/Security/Util/IO.hs view

@@ -9,6 +9,7 @@   , timedIO   ) where +import MyPrelude import Control.Concurrent (threadDelay) import Control.Exception import Data.Time

src/Hackage/Security/Util/JSON.hs view

@@ -23,6 +23,7 @@   , Int54   ) where +import MyPrelude import Control.Monad (liftM) import Data.Maybe (catMaybes) import Data.Map (Map)

src/Hackage/Security/Util/Lens.hs view

@@ -14,6 +14,7 @@   , set   ) where +import MyPrelude import Control.Applicative import Data.Functor.Identity

src/Hackage/Security/Util/Path.hs view

@@ -83,6 +83,7 @@   , IO.hSeek   ) where +import MyPrelude import Control.Monad import Data.List (isPrefixOf) import System.IO (IOMode(..), BufferMode(..), Handle, SeekMode(..))@@ -294,7 +295,7 @@ fromAbsoluteFilePath :: FilePath -> Path Absolute fromAbsoluteFilePath fp   | FP.Native.isAbsolute fp = mkPathNative fp-  | otherwise               = error "fromAbsoluteFilePath: not an absolute path"+  | otherwise               = error ("fromAbsoluteFilePath: not an absolute path: " ++ fp)  {-------------------------------------------------------------------------------   Wrappers around System.IO

src/Hackage/Security/Util/Pretty.hs view

@@ -3,6 +3,8 @@     Pretty(..)   ) where +import MyPrelude+ -- | Produce a human-readable string class Pretty a where   pretty :: a -> String

src/Hackage/Security/Util/Some.hs view

@@ -19,6 +19,7 @@ #endif   ) where +import MyPrelude #if MIN_VERSION_base(4,7,0) import Data.Typeable (Typeable) #else

src/Hackage/Security/Util/Stack.hs view

@@ -3,6 +3,8 @@     (:-)(..)   ) where +import MyPrelude+ data h :- t = h :- t   deriving (Eq, Show) infixr 5 :-

src/Hackage/Security/Util/TypedEmbedded.hs view

@@ -7,6 +7,8 @@   , AsType(..)   ) where +import MyPrelude+ -- | Type equality proofs -- -- This is a direct copy of "type-equality:Data.Type.Equality"; if we don't

+ src/MyPrelude.hs view

@@ -0,0 +1,31 @@+-- | Smooth over differences between various ghc versions by making older+-- preludes look like 4.8.0+{-# LANGUAGE CPP #-}+module MyPrelude (+    module P+#if !MIN_VERSION_base(4,8,0)+  , Applicative(..)+  , Monoid(..)+  , (<$>)+  , (<$)+  , Traversable(traverse)+  , displayException+#endif+  ) where++#if MIN_VERSION_base(4,8,0)+import Prelude as P+#else+#if MIN_VERSION_base(4,6,0)+import Prelude as P+#else+import Prelude as P hiding (catch)+#endif+import Control.Applicative+import Control.Exception (Exception)+import Data.Monoid+import Data.Traversable (Traversable(traverse))++displayException :: Exception e => e -> String+displayException = show+#endif

− src/Prelude.hs

@@ -1,32 +0,0 @@--- | Smooth over differences between various ghc versions by making older--- preludes look like 4.8.0-{-# LANGUAGE PackageImports #-}-{-# LANGUAGE CPP #-}-module Prelude (-    module P-#if !MIN_VERSION_base(4,8,0)-  , Applicative(..)-  , Monoid(..)-  , (<$>)-  , (<$)-  , Traversable(traverse)-  , displayException-#endif-  ) where--#if MIN_VERSION_base(4,8,0)-import "base" Prelude as P-#else-#if MIN_VERSION_base(4,6,0)-import "base" Prelude as P-#else-import "base" Prelude as P hiding (catch)-#endif-import Control.Applicative-import Control.Exception (Exception)-import Data.Monoid-import Data.Traversable (Traversable(traverse))--displayException :: Exception e => e -> String-displayException = show-#endif

src/Text/JSON/Canonical.hs view

@@ -30,6 +30,7 @@   , prettyCanonicalJSON   ) where +import MyPrelude import Text.ParserCombinators.Parsec          ( CharParser, (<|>), (<?>), many, between, sepBy          , satisfy, char, string, digit, spaces