[WIP] Remove CLI option

haskell · Oct 28, 2023 · ab35390 · ab35390
1 parent 3299ab5
commit ab35390
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/cabal-install/src/Distribution/Client/Config.hs b/cabal-install/src/Distribution/Client/Config.hs
@@ -547,7 +547,6 @@ instance Semigroup SavedConfig where
             configExConstraints = lastNonEmpty configExConstraints
           , -- TODO: NubListify
             configPreferences = lastNonEmpty configPreferences
-          , configSolver = combine configSolver
           , configAllowNewer =
               combineMonoid savedConfigureExFlags configAllowNewer
           , configAllowOlder =

diff --git a/cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs b/cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs
@@ -641,7 +641,6 @@ convertLegacyAllPackageFlags globalFlags configFlags configExFlags installFlags
       { configCabalVersion = projectConfigCabalVersion
       , configExConstraints = projectConfigConstraints
       , configPreferences = projectConfigPreferences
-      , configSolver = projectConfigSolver
       , configAllowOlder = projectConfigAllowOlder
       , configAllowNewer = projectConfigAllowNewer
       , configWriteGhcEnvironmentFilesPolicy =
@@ -911,7 +910,6 @@ convertToLegacySharedConfig
           , configBackup = mempty
           , configExConstraints = projectConfigConstraints
           , configPreferences = projectConfigPreferences
-          , configSolver = projectConfigSolver
           , configAllowOlder = projectConfigAllowOlder
           , configAllowNewer = projectConfigAllowNewer
           , configWriteGhcEnvironmentFilesPolicy =

diff --git a/cabal-install/src/Distribution/Client/Setup.hs b/cabal-install/src/Distribution/Client/Setup.hs
@@ -829,7 +829,6 @@ data ConfigExFlags = ConfigExFlags
   , configBackup :: Flag Bool
   , configExConstraints :: [(UserConstraint, ConstraintSource)]
   , configPreferences :: [PackageVersionConstraint]
-  , configSolver :: Flag PreSolver
   , configAllowNewer :: Maybe AllowNewer
   , configAllowOlder :: Maybe AllowOlder
   , configWriteGhcEnvironmentFilesPolicy
@@ -838,7 +837,7 @@ data ConfigExFlags = ConfigExFlags
   deriving (Eq, Show, Generic)
 
 defaultConfigExFlags :: ConfigExFlags
-defaultConfigExFlags = mempty{configSolver = Flag defaultSolver}
+defaultConfigExFlags = mempty
 
 configureExCommand :: CommandUI (ConfigFlags, ConfigExFlags)
 configureExCommand =
@@ -923,7 +922,6 @@ configureExOptions _showOrParseArgs src =
           )
           (map prettyShow)
       )
-  , optionSolver configSolver (\v flags -> flags{configSolver = v})
   , option
       []
       ["allow-older"]