diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 2859e6096f160909ac5bf3265e4342e2a0330b2f..c864df3feae574388e07c3e1e8104221210a61ad 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -159,12 +159,18 @@ library
         Distribution.Client.CmdBench
         Distribution.Client.CmdBuild
         Distribution.Client.CmdConfigure
+        Distribution.Client.CmdErrorMessages
         Distribution.Client.CmdFreeze
         Distribution.Client.CmdHaddock
         Distribution.Client.CmdRepl
         Distribution.Client.CmdRun
         Distribution.Client.CmdTest
-        Distribution.Client.CmdErrorMessages
+        Distribution.Client.Compat.ExecutablePath
+        Distribution.Client.Compat.FileLock
+        Distribution.Client.Compat.FilePerms
+        Distribution.Client.Compat.Prelude
+        Distribution.Client.Compat.Process
+        Distribution.Client.Compat.Semaphore
         Distribution.Client.Config
         Distribution.Client.Configure
         Distribution.Client.Dependency
@@ -175,11 +181,11 @@ library
         Distribution.Client.FetchUtils
         Distribution.Client.FileMonitor
         Distribution.Client.Freeze
+        Distribution.Client.GZipUtils
         Distribution.Client.GenBounds
         Distribution.Client.Get
         Distribution.Client.Glob
         Distribution.Client.GlobalFlags
-        Distribution.Client.GZipUtils
         Distribution.Client.Haddock
         Distribution.Client.HttpUtils
         Distribution.Client.IndexUtils
@@ -202,12 +208,12 @@ library
         Distribution.Client.ProjectBuilding
         Distribution.Client.ProjectBuilding.Types
         Distribution.Client.ProjectConfig
-        Distribution.Client.ProjectConfig.Types
         Distribution.Client.ProjectConfig.Legacy
+        Distribution.Client.ProjectConfig.Types
         Distribution.Client.ProjectOrchestration
+        Distribution.Client.ProjectPlanOutput
         Distribution.Client.ProjectPlanning
         Distribution.Client.ProjectPlanning.Types
-        Distribution.Client.ProjectPlanOutput
         Distribution.Client.RebuildMonad
         Distribution.Client.Reconfigure
         Distribution.Client.Run
@@ -221,49 +227,22 @@ library
         Distribution.Client.Security.HTTP
         Distribution.Client.Setup
         Distribution.Client.SetupWrapper
-        Distribution.Client.SrcDist
         Distribution.Client.SolverInstallPlan
         Distribution.Client.SourceFiles
+        Distribution.Client.SrcDist
         Distribution.Client.Store
         Distribution.Client.Tar
-        Distribution.Client.Targets
         Distribution.Client.TargetSelector
+        Distribution.Client.Targets
         Distribution.Client.Types
         Distribution.Client.Update
         Distribution.Client.Upload
         Distribution.Client.Utils
         Distribution.Client.Utils.Assertion
         Distribution.Client.Utils.Json
-        Distribution.Client.World
         Distribution.Client.Win32SelfUpgrade
-        Distribution.Client.Compat.ExecutablePath
-        Distribution.Client.Compat.FileLock
-        Distribution.Client.Compat.FilePerms
-        Distribution.Client.Compat.Prelude
-        Distribution.Client.Compat.Process
-        Distribution.Client.Compat.Semaphore
+        Distribution.Client.World
         Distribution.Solver.Compat.Prelude
-        Distribution.Solver.Types.ComponentDeps
-        Distribution.Solver.Types.ConstraintSource
-        Distribution.Solver.Types.DependencyResolver
-        Distribution.Solver.Types.Flag
-        Distribution.Solver.Types.InstalledPreference
-        Distribution.Solver.Types.InstSolverPackage
-        Distribution.Solver.Types.LabeledPackageConstraint
-        Distribution.Solver.Types.OptionalStanza
-        Distribution.Solver.Types.PackageConstraint
-        Distribution.Solver.Types.PackageFixedDeps
-        Distribution.Solver.Types.PackageIndex
-        Distribution.Solver.Types.PackagePath
-        Distribution.Solver.Types.PackagePreferences
-        Distribution.Solver.Types.PkgConfigDb
-        Distribution.Solver.Types.Progress
-        Distribution.Solver.Types.ResolverPackage
-        Distribution.Solver.Types.Settings
-        Distribution.Solver.Types.SolverId
-        Distribution.Solver.Types.SolverPackage
-        Distribution.Solver.Types.SourcePackage
-        Distribution.Solver.Types.Variable
         Distribution.Solver.Modular
         Distribution.Solver.Modular.Assignment
         Distribution.Solver.Modular.Builder
@@ -276,13 +255,13 @@ library
         Distribution.Solver.Modular.Flag
         Distribution.Solver.Modular.Index
         Distribution.Solver.Modular.IndexConversion
-        Distribution.Solver.Modular.Linking
         Distribution.Solver.Modular.LabeledGraph
+        Distribution.Solver.Modular.Linking
         Distribution.Solver.Modular.Log
         Distribution.Solver.Modular.Message
+        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
@@ -290,6 +269,27 @@ library
         Distribution.Solver.Modular.Var
         Distribution.Solver.Modular.Version
         Distribution.Solver.Modular.WeightedPSQ
+        Distribution.Solver.Types.ComponentDeps
+        Distribution.Solver.Types.ConstraintSource
+        Distribution.Solver.Types.DependencyResolver
+        Distribution.Solver.Types.Flag
+        Distribution.Solver.Types.InstSolverPackage
+        Distribution.Solver.Types.InstalledPreference
+        Distribution.Solver.Types.LabeledPackageConstraint
+        Distribution.Solver.Types.OptionalStanza
+        Distribution.Solver.Types.PackageConstraint
+        Distribution.Solver.Types.PackageFixedDeps
+        Distribution.Solver.Types.PackageIndex
+        Distribution.Solver.Types.PackagePath
+        Distribution.Solver.Types.PackagePreferences
+        Distribution.Solver.Types.PkgConfigDb
+        Distribution.Solver.Types.Progress
+        Distribution.Solver.Types.ResolverPackage
+        Distribution.Solver.Types.Settings
+        Distribution.Solver.Types.SolverId
+        Distribution.Solver.Types.SolverPackage
+        Distribution.Solver.Types.SourcePackage
+        Distribution.Solver.Types.Variable
         Paths_cabal_install
 
     -- NOTE: when updating build-depends, don't forget to update version regexps
diff --git a/cabal.project b/cabal.project
index e6899cb7d619da606225df8ee201859d05dd218f..02c716f659c7fac91067be5d8e05e2b58b6cf8be 100644
--- a/cabal.project
+++ b/cabal.project
@@ -1,6 +1,6 @@
 packages: Cabal/ cabal-testsuite/ cabal-install/
-constraints: unix >= 2.7.1.0,
-             cabal-install +lib +monolithic
+constraints: unix >= 2.7.1.0
+--             cabal-install +lib +monolithic
 
 -- Uncomment to allow picking up extra local unpacked deps:
 --optional-packages: */