Upgrade cabal to 3.10 branch

Switch to 3.10 branch for cabal submodule Update internal libraries in hackport.cabal to match their upstream counterparts. Module names were re-ordered to match their ordering upstream. NOTE: this introduces a new lower bound for a dependency: `directory >=1.3.7.0`. This is not bundled with GHC until v9.4, which will cause problems for Gentoo users unless a) they upgrade to newer GHC or b) the 'directory' library is upgraded for older GHC versions in the tree. Signed-off-by: hololeap <[email protected]>
hololeap · Jan 16, 2024 · c0050a2 · c0050a2
1 parent 66e02e1
commit c0050a2
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 26 deletions.
diff --git a/cabal b/cabal
diff --git a/hackport.cabal b/hackport.cabal
@@ -81,7 +81,7 @@ library hackport-external-libs-Cabal-syntax
   hs-source-dirs:   cabal/Cabal-syntax/src
   build-depends:
     , array         >=0.4.0.1
-    , base          >=4.6      && <5
+    , base          >=4.9     && <5
     , binary        >=0.7
     , bytestring    >=0.10.0.0
     , containers    >=0.5.0.0
@@ -186,8 +186,8 @@ library hackport-external-libs-Cabal-syntax
     Distribution.Types.HookedBuildInfo
     Distribution.Types.IncludeRenaming
     Distribution.Types.InstalledPackageInfo
-    Distribution.Types.InstalledPackageInfo.FieldGrammar
     Distribution.Types.InstalledPackageInfo.Lens
+    Distribution.Types.InstalledPackageInfo.FieldGrammar
     Distribution.Types.LegacyExeDependency
     Distribution.Types.Lens
     Distribution.Types.Library
@@ -270,7 +270,7 @@ library hackport-external-libs-Cabal
   build-depends:
     , hackport-external-libs-Cabal-syntax
     , array         >=0.4.0.1
-    , base          >=4.6      && <5
+    , base          >=4.9      && <5
     , bytestring    >=0.10.0.0
     , containers    >=0.5.0.0
     , deepseq       >=1.3.0.1
@@ -286,32 +286,36 @@ library hackport-external-libs-Cabal
     , unix          >=2.6.0.0
 
   exposed-modules:
-    Distribution.Backpack.ComponentsGraph
     Distribution.Backpack.Configure
+    Distribution.Backpack.ComponentsGraph
     Distribution.Backpack.ConfiguredComponent
     Distribution.Backpack.DescribeUnitId
     Distribution.Backpack.FullUnitId
     Distribution.Backpack.LinkedComponent
     Distribution.Backpack.ModSubst
     Distribution.Backpack.ModuleShape
     Distribution.Backpack.PreModuleShape
+    Distribution.Utils.IOData
+    Distribution.Utils.LogProgress
+    Distribution.Utils.MapAccum
 --     Distribution.Compat.CreatePipe
     Distribution.Compat.Directory
     Distribution.Compat.Environment
     Distribution.Compat.FilePath
     Distribution.Compat.Internal.TempFile
+    Distribution.Compat.ResponseFile
     Distribution.Compat.Prelude.Internal
     Distribution.Compat.Process
-    Distribution.Compat.ResponseFile
     Distribution.Compat.Stack
     Distribution.Compat.Time
-    Distribution.PackageDescription.Check
     Distribution.Make
+    Distribution.PackageDescription.Check
     Distribution.ReadE
     Distribution.Simple
     Distribution.Simple.Bench
     Distribution.Simple.Build
     Distribution.Simple.Build.Macros
+    Distribution.Simple.Build.PackageInfoModule
     Distribution.Simple.Build.PathsModule
     Distribution.Simple.BuildPaths
     Distribution.Simple.BuildTarget
@@ -323,8 +327,8 @@ library hackport-external-libs-Cabal
     Distribution.Simple.Flag
     Distribution.Simple.GHC
     Distribution.Simple.GHCJS
-    Distribution.Simple.Glob
     Distribution.Simple.Haddock
+    Distribution.Simple.Glob
     Distribution.Simple.HaskellSuite
     Distribution.Simple.Hpc
     Distribution.Simple.Install
@@ -364,40 +368,39 @@ library hackport-external-libs-Cabal
     Distribution.TestSuite
     Distribution.Types.AnnotatedId
     Distribution.Types.ComponentInclude
-    Distribution.Types.ComponentLocalBuildInfo
     Distribution.Types.DumpBuildInfo
-    Distribution.Types.GivenComponent
-    Distribution.Types.LocalBuildInfo
     Distribution.Types.PackageName.Magic
+    Distribution.Types.ComponentLocalBuildInfo
+    Distribution.Types.LocalBuildInfo
     Distribution.Types.TargetInfo
-    Distribution.Utils.IOData
+    Distribution.Types.GivenComponent
     Distribution.Utils.Json
-    Distribution.Utils.LogProgress
-    Distribution.Utils.MapAccum
     Distribution.Utils.NubList
     Distribution.Utils.Progress
     Distribution.Verbosity
     Distribution.Verbosity.Internal
 
   other-modules:
-    Distribution.Backpack.Id
-    Distribution.Backpack.MixLink
-    Distribution.Backpack.ModuleScope
     Distribution.Backpack.PreExistingComponent
     Distribution.Backpack.ReadyComponent
+    Distribution.Backpack.MixLink
+    Distribution.Backpack.ModuleScope
     Distribution.Backpack.UnifyM
+    Distribution.Backpack.Id
+    Distribution.Utils.UnionFind
     Distribution.Compat.Async
     Distribution.Compat.CopyFile
     Distribution.Compat.GetShortPathName
 --     Distribution.Compat.SnocList
     Distribution.GetOpt
     Distribution.Lex
     Distribution.Simple.Build.Macros.Z
+    Distribution.Simple.Build.PackageInfoModule.Z
     Distribution.Simple.Build.PathsModule.Z
     Distribution.Simple.GHC.EnvironmentParser
     Distribution.Simple.GHC.Internal
     Distribution.Simple.GHC.ImplInfo
-    Distribution.Utils.UnionFind
+    Distribution.Simple.ConfigureScript
     Distribution.ZinzaPrelude
     Paths_Cabal
 
@@ -559,6 +562,7 @@ library hackport-external-libs-cabal-install-solver
 
   exposed-modules:
     Distribution.Client.Utils.Assertion
+
     Distribution.Solver.Compat.Prelude
     Distribution.Solver.Modular
     Distribution.Solver.Modular.Assignment
@@ -577,9 +581,9 @@ library hackport-external-libs-cabal-install-solver
     Distribution.Solver.Modular.Log
     Distribution.Solver.Modular.Message
     Distribution.Solver.Modular.MessageUtils
-    Distribution.Solver.Modular.PSQ
     Distribution.Solver.Modular.Package
     Distribution.Solver.Modular.Preference
+    Distribution.Solver.Modular.PSQ
     Distribution.Solver.Modular.RetryLog
     Distribution.Solver.Modular.Solver
     Distribution.Solver.Modular.Tree
@@ -591,8 +595,8 @@ library hackport-external-libs-cabal-install-solver
     Distribution.Solver.Types.ConstraintSource
     Distribution.Solver.Types.DependencyResolver
     Distribution.Solver.Types.Flag
-    Distribution.Solver.Types.InstSolverPackage
     Distribution.Solver.Types.InstalledPreference
+    Distribution.Solver.Types.InstSolverPackage
     Distribution.Solver.Types.LabeledPackageConstraint
     Distribution.Solver.Types.OptionalStanza
     Distribution.Solver.Types.PackageConstraint
@@ -627,7 +631,7 @@ library hackport-external-libs-cabal-install
     , containers                               >=0.5.6.2
     , cryptohash-sha256                        >=0.11
     , deepseq                                  >=1.4.1.1
-    , directory                                >=1.2.2.0
+    , directory                                >=1.3.7.0
     , echo                                     >=0.1.3
     , edit-distance                            >=0.2.2
     , exceptions                               >=0.10.4
@@ -649,9 +653,14 @@ library hackport-external-libs-cabal-install
     , tar                                      >=0.5.0.3
     , text                                     >=1.2.3
     , time                                     >=1.5.0.1
+    , unix                                     >=2.5
     , zlib                                     >=0.5.3
 
   exposed-modules:
+    Distribution.Deprecated.ParseUtils
+    Distribution.Deprecated.ReadP
+    Distribution.Deprecated.ViewAsFieldDescr
+
     Distribution.Client.BuildReports.Anonymous
     Distribution.Client.BuildReports.Lens
     Distribution.Client.BuildReports.Storage
@@ -666,6 +675,7 @@ library hackport-external-libs-cabal-install
 --     Distribution.Client.CmdExec
 --     Distribution.Client.CmdFreeze
 --     Distribution.Client.CmdHaddock
+--     Distribution.Client.CmdHaddockProject
 --     Distribution.Client.CmdInstall
     Distribution.Client.CmdInstall.ClientInstallFlags
 --     Distribution.Client.CmdInstall.ClientInstallTargetSelector
@@ -681,8 +691,8 @@ library hackport-external-libs-cabal-install
     Distribution.Client.Compat.ExecutablePath
     Distribution.Client.Compat.Orphans
     Distribution.Client.Compat.Prelude
---     Distribution.Client.Compat.Process
     Distribution.Client.Compat.Semaphore
+    Distribution.Client.Compat.Tar
     Distribution.Client.Config
 --     Distribution.Client.Configure
     Distribution.Client.Dependency
@@ -710,9 +720,9 @@ library hackport-external-libs-cabal-install
 --     Distribution.Client.Init.FlagExtractors
 --     Distribution.Client.Init.Format
 --     Distribution.Client.Init.Interactive.Command
---     Distribution.Client.Init.Licenses
 --     Distribution.Client.Init.NonInteractive.Command
 --     Distribution.Client.Init.NonInteractive.Heuristics
+--     Distribution.Client.Init.Licenses
 --     Distribution.Client.Init.Prompt
 --     Distribution.Client.Init.Simple
     Distribution.Client.Init.Types
@@ -722,6 +732,7 @@ library hackport-external-libs-cabal-install
 --     Distribution.Client.InstallSymlink
     Distribution.Client.JobControl
 --     Distribution.Client.List
+--     Distribution.Client.Main
 --     Distribution.Client.Manpage
     Distribution.Client.ManpageFlags
 --     Distribution.Client.Nix
@@ -749,6 +760,7 @@ library hackport-external-libs-cabal-install
     Distribution.Client.Security.HTTP
     Distribution.Client.Setup
     Distribution.Client.SetupWrapper
+--     Distribution.Client.Signal
     Distribution.Client.SolverInstallPlan
     Distribution.Client.SourceFiles
     Distribution.Client.SrcDist
@@ -780,11 +792,11 @@ library hackport-external-libs-cabal-install
     Distribution.Client.VCS
     Distribution.Client.Version
 --     Distribution.Client.Win32SelfUpgrade
-    Distribution.Deprecated.ParseUtils
-    Distribution.Deprecated.ReadP
-    Distribution.Deprecated.ViewAsFieldDescr
     Paths_cabal_install
 
+  default-extensions:
+    TypeOperators
+
 library hackport-internal
   import:             warnings
   default-language:   Haskell2010