cabal-install 3.14.1.0 → 3.14.1.1

raw patch · 20 files changed

+26/−53 lines, 20 filesdep ~open-browserdep ~randomdep ~tarPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: open-browser, random, tar, unix

API changes (from Hackage documentation)

Files

• cabal-install.cabal +2/−2
• src/Distribution/Client/Compat/Semaphore.hs +1/−3
• src/Distribution/Client/Errors.hs +1/−1
• src/Distribution/Client/FileMonitor.hs +1/−1
• src/Distribution/Client/HashValue.hs +1/−2
• src/Distribution/Client/IndexUtils.hs +1/−1
• src/Distribution/Client/InstallPlan.hs +0/−2
• src/Distribution/Client/ProjectBuilding/Types.hs +1/−3
• src/Distribution/Client/ProjectConfig.hs +4/−6
• src/Distribution/Client/ProjectConfig/Types.hs +4/−5
• src/Distribution/Client/ProjectPlanning/Types.hs +3/−4
• src/Distribution/Client/SavedFlags.hs +0/−3
• src/Distribution/Client/Security/HTTP.hs +0/−2
• src/Distribution/Client/Setup.hs +1/−1
• src/Distribution/Client/SolverInstallPlan.hs +1/−2
• src/Distribution/Client/Types/BuildResults.hs +3/−3
• src/Distribution/Client/Types/PackageLocation.hs +1/−1
• tests/IntegrationTests2.hs +0/−2
• tests/UnitTests/Distribution/Client/JobControl.hs +1/−3
• tests/UnitTests/Options.hs +0/−6

@@ -1,7 +1,7 @@ Cabal-Version:      3.0  Name:               cabal-install-Version:            3.14.1.0+Version:            3.14.1.1 Synopsis:           The command-line interface for Cabal and Hackage. Description:     The \'cabal\' command-line program simplifies the process of managing@@ -260,7 +260,7 @@       -- newer directory for symlinks       build-depends: Win32 >= 2.8 && < 3, directory >=1.3.1.0     else-      build-depends: unix >= 2.5 && < 2.9+      build-depends: unix >= 2.5 && < 2.8 || >= 2.8.6.0 && < 2.9      if flag(lukko)       build-depends: lukko >= 0.1 && <0.2

@@ -1,4 +1,3 @@-{-# LANGUAGE DeriveDataTypeable #-} {-# OPTIONS_GHC -funbox-strict-fields #-}  module Distribution.Client.Compat.Semaphore@@ -22,13 +21,12 @@ import Control.Monad (join, unless) import Data.List.NonEmpty (NonEmpty (..)) import qualified Data.List.NonEmpty as NE-import Data.Typeable (Typeable)  -- | 'QSem' is a quantity semaphore in which the resource is acquired -- and released in units of one. It provides guaranteed FIFO ordering -- for satisfying blocked `waitQSem` calls. data QSem = QSem !(TVar Int) !(TVar [TVar Bool]) !(TVar [TVar Bool])-  deriving (Eq, Typeable)+  deriving (Eq)  newQSem :: Int -> IO QSem newQSem i = atomically $ do

@@ -186,7 +186,7 @@   | MissingPackageList RemoteRepo   | CmdPathAcceptsNoTargets   | CmdPathCommandDoesn'tSupportDryRun-  deriving (Show, Typeable)+  deriving (Show)  exceptionCodeCabalInstall :: CabalInstallException -> Int exceptionCodeCabalInstall e = case e of

@@ -1121,7 +1121,7 @@ handleErrorCall :: a -> IO a -> IO a handleErrorCall e = handle handler   where-    handler (ErrorCallWithLocation _ _) = return e+    handler (ErrorCall _) = return e  -- | Run an IO computation, returning @e@ if there is any 'IOException'. --

@@ -1,5 +1,4 @@ {-# LANGUAGE CPP #-}-{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-}  module Distribution.Client.HashValue@@ -38,7 +37,7 @@ -- package ids.  newtype HashValue = HashValue BS.ByteString-  deriving (Eq, Generic, Show, Typeable)+  deriving (Eq, Generic, Show)  -- Cannot do any sensible validation here. Although we use SHA256 -- for stuff we hash ourselves, we can also get hashes from TUF

@@ -692,7 +692,7 @@   , preferredVersionsOriginalDependency :: String   -- ^ Original input that produced the parser error.   }-  deriving (Generic, Read, Show, Eq, Ord, Typeable)+  deriving (Generic, Read, Show, Eq, Ord)  -- | Parse `preferred-versions` file, collecting parse errors that can be shown -- in error messages.

@@ -1,6 +1,5 @@ {-# LANGUAGE BangPatterns #-} {-# LANGUAGE ConstraintKinds #-}-{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE ScopedTypeVariables #-}@@ -258,7 +257,6 @@   { planGraph :: !(Graph (GenericPlanPackage ipkg srcpkg))   , planIndepGoals :: !IndependentGoals   }-  deriving (Typeable)  -- | 'GenericInstallPlan' specialised to most commonly used types. type InstallPlan =

@@ -1,5 +1,3 @@-{-# LANGUAGE DeriveDataTypeable #-}- -- | Types for the "Distribution.Client.ProjectBuilding" -- -- Moved out to avoid module cycles.@@ -156,7 +154,7 @@   { buildFailureLogFile :: Maybe FilePath   , buildFailureReason :: BuildFailureReason   }-  deriving (Show, Typeable)+  deriving (Show)  instance Exception BuildFailure 

@@ -1,5 +1,4 @@ {-# LANGUAGE CPP #-}-{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE RecordWildCards #-}@@ -655,7 +654,7 @@   | BadProjectRootAbsoluteFileNotFound FilePath   | BadProjectRootDirFileNotFound FilePath FilePath   | BadProjectRootFileBroken FilePath-  deriving (Show, Typeable, Eq)+  deriving (Show, Eq)  instance Exception BadProjectRoot where   displayException = renderBadProjectRoot@@ -890,7 +889,7 @@ -- | Exception thrown by 'findProjectPackages'. data BadPackageLocations   = BadPackageLocations (Set ProjectConfigProvenance) [BadPackageLocation]-  deriving (Show, Typeable)+  deriving (Show)  instance Exception BadPackageLocations where   displayException = renderBadPackageLocations@@ -1548,7 +1547,6 @@       -- ^ We might discover the spec version the package needs       [PWarning]       -- ^ warnings-  deriving (Typeable)  -- | Manual instance which skips file contents instance Show CabalFileParseError where@@ -1600,7 +1598,7 @@ data CabalFileSearchFailure   = NoCabalFileFound FilePath   | MultipleCabalFilesFound FilePath-  deriving (Show, Typeable)+  deriving (Show)  instance Exception CabalFileSearchFailure @@ -1710,7 +1708,7 @@  data BadPerPackageCompilerPaths   = BadPerPackageCompilerPaths [(PackageName, String)]-  deriving (Show, Typeable)+  deriving (Show)  instance Exception BadPerPackageCompilerPaths where   displayException = renderBadPerPackageCompilerPaths

@@ -1,4 +1,3 @@-{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} @@ -152,7 +151,7 @@   -- any packages which are explicitly named in `cabal.project`.   , projectConfigSpecificPackage :: MapMappend PackageName PackageConfig   }-  deriving (Eq, Show, Generic, Typeable)+  deriving (Eq, Show, Generic)  -- | That part of the project configuration that only affects /how/ we build -- and not the /value/ of the things we build. This means this information@@ -338,7 +337,7 @@ -- | Newtype wrapper for 'Map' that provides a 'Monoid' instance that takes -- the last value rather than the first value for overlapping keys. newtype MapLast k v = MapLast {getMapLast :: Map k v}-  deriving (Eq, Show, Functor, Generic, Binary, Typeable)+  deriving (Eq, Show, Functor, Generic, Binary)  instance (Structured k, Structured v) => Structured (MapLast k v) @@ -354,7 +353,7 @@ -- | Newtype wrapper for 'Map' that provides a 'Monoid' instance that -- 'mappend's values of overlapping keys rather than taking the first. newtype MapMappend k v = MapMappend {getMapMappend :: Map k v}-  deriving (Eq, Show, Functor, Generic, Binary, Typeable)+  deriving (Eq, Show, Functor, Generic, Binary)  instance (Structured k, Structured v) => Structured (MapMappend k v) @@ -439,7 +438,7 @@   -- solverSettingOverrideReinstall :: Bool,   -- solverSettingUpgradeDeps       :: Bool   }-  deriving (Eq, Show, Generic, Typeable)+  deriving (Eq, Show, Generic)  instance Binary SolverSettings instance Structured SolverSettings

@@ -1,4 +1,3 @@-{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-}@@ -193,7 +192,7 @@   -- used.   , pkgConfigReplOptions :: ReplOptions   }-  deriving (Show, Generic, Typeable)+  deriving (Show, Generic)  -- TODO: [code cleanup] no Eq instance @@ -338,7 +337,7 @@     elabPkgOrComp :: ElaboratedPackageOrComponent   -- ^ Component/package specific information   }-  deriving (Eq, Show, Generic, Typeable)+  deriving (Eq, Show, Generic)  normaliseConfiguredPackage   :: ElaboratedSharedConfig@@ -934,7 +933,7 @@   | SetupCustomImplicitDeps   | SetupNonCustomExternalLib   | SetupNonCustomInternalLib-  deriving (Eq, Show, Generic, Typeable)+  deriving (Eq, Show, Generic)  instance Binary SetupScriptStyle instance Structured SetupScriptStyle

@@ -1,5 +1,3 @@-{-# LANGUAGE DeriveDataTypeable #-}- module Distribution.Client.SavedFlags   ( readCommandFlags   , writeCommandFlags@@ -67,7 +65,6 @@   = SavedArgsErrorHelp Args   | SavedArgsErrorList Args   | SavedArgsErrorOther Args [String]-  deriving (Typeable)  instance Show SavedArgsError where   show (SavedArgsErrorHelp args) =

@@ -1,5 +1,4 @@ {-# LANGUAGE CPP #-}-{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE RecordWildCards #-}@@ -180,7 +179,6 @@ -------------------------------------------------------------------------------}  data UnexpectedResponse = UnexpectedResponse URI Int-  deriving (Typeable)  instance HC.Pretty UnexpectedResponse where   pretty (UnexpectedResponse uri code) =

@@ -1621,7 +1621,7 @@   { checkVerbosity :: Flag Verbosity   , checkIgnore :: [CheckExplanationIDString]   }-  deriving (Show, Typeable)+  deriving (Show)  defaultCheckFlags :: CheckFlags defaultCheckFlags =

@@ -1,4 +1,3 @@-{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE TypeFamilies #-} @@ -93,7 +92,7 @@   { planIndex :: !SolverPlanIndex   , planIndepGoals :: !IndependentGoals   }-  deriving (Typeable, Generic)+  deriving (Generic)  {- -- | Much like 'planPkgIdOf', but mapping back to full packages.

@@ -32,7 +32,7 @@   | BuildFailed SomeException   | TestsFailed SomeException   | InstallFailed SomeException-  deriving (Show, Typeable, Generic)+  deriving (Show, Generic)  instance Exception BuildFailure @@ -48,9 +48,9 @@   deriving (Show, Generic)  data DocsResult = DocsNotTried | DocsFailed | DocsOk-  deriving (Show, Generic, Typeable)+  deriving (Show, Generic) data TestsResult = TestsNotTried | TestsOk-  deriving (Show, Generic, Typeable)+  deriving (Show, Generic)  instance Binary BuildFailure instance Binary BuildResult

@@ -37,7 +37,7 @@     RepoTarballPackage Repo PackageId local   | -- | A package available from a version control system source repository     RemoteSourceRepoPackage SourceRepoMaybe local-  deriving (Show, Functor, Eq, Ord, Generic, Typeable)+  deriving (Show, Functor, Eq, Ord, Generic)  instance Binary local => Binary (PackageLocation local) instance Structured local => Structured (PackageLocation local)

@@ -1,7 +1,6 @@ {- FOURMOLU_DISABLE -} {-# LANGUAGE CPP #-} {-# LANGUAGE BangPatterns #-}-{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE OverloadedStrings #-}@@ -1818,7 +1817,6 @@   data GhcPath = GhcPath (Maybe FilePath)-  deriving Typeable  instance IsOption GhcPath where   defaultValue = GhcPath Nothing

@@ -1,5 +1,3 @@-{-# LANGUAGE DeriveDataTypeable #-}- module UnitTests.Distribution.Client.JobControl (tests) where  import Distribution.Client.JobControl@@ -178,7 +176,7 @@     return $ Set.fromList (xs' ++ ys') `Set.isSubsetOf` Set.fromList (xs ++ ys)  data TestException = TestException Int-  deriving (Typeable, Show)+  deriving (Show)  instance Exception TestException 

@@ -1,5 +1,3 @@-{-# LANGUAGE DeriveDataTypeable #-}- module UnitTests.Options   ( OptionShowSolverLog (..)   , OptionMtimeChangeDelay (..)@@ -9,7 +7,6 @@ where  import Data.Proxy-import Data.Typeable  import Test.Tasty.Options @@ -25,7 +22,6 @@   ]  newtype OptionShowSolverLog = OptionShowSolverLog Bool-  deriving (Typeable)  instance IsOption OptionShowSolverLog where   defaultValue = OptionShowSolverLog False@@ -35,7 +31,6 @@   optionCLParser = flagCLParser Nothing (OptionShowSolverLog True)  newtype OptionMtimeChangeDelay = OptionMtimeChangeDelay Int-  deriving (Typeable)  instance IsOption OptionMtimeChangeDelay where   defaultValue = OptionMtimeChangeDelay 0@@ -47,7 +42,6 @@         ++ "file modification, in microseconds"  newtype RunNetworkTests = RunNetworkTests Bool-  deriving (Typeable)  instance IsOption RunNetworkTests where   defaultValue = RunNetworkTests True