Skip to content

Commit ab35390

Browse files
committed
[WIP] Remove CLI option
1 parent 3299ab5 commit ab35390

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

cabal-install/src/Distribution/Client/Config.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,6 @@ instance Semigroup SavedConfig where
547547
configExConstraints = lastNonEmpty configExConstraints
548548
, -- TODO: NubListify
549549
configPreferences = lastNonEmpty configPreferences
550-
, configSolver = combine configSolver
551550
, configAllowNewer =
552551
combineMonoid savedConfigureExFlags configAllowNewer
553552
, configAllowOlder =

cabal-install/src/Distribution/Client/ProjectConfig/Legacy.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,6 @@ convertLegacyAllPackageFlags globalFlags configFlags configExFlags installFlags
641641
{ configCabalVersion = projectConfigCabalVersion
642642
, configExConstraints = projectConfigConstraints
643643
, configPreferences = projectConfigPreferences
644-
, configSolver = projectConfigSolver
645644
, configAllowOlder = projectConfigAllowOlder
646645
, configAllowNewer = projectConfigAllowNewer
647646
, configWriteGhcEnvironmentFilesPolicy =
@@ -911,7 +910,6 @@ convertToLegacySharedConfig
911910
, configBackup = mempty
912911
, configExConstraints = projectConfigConstraints
913912
, configPreferences = projectConfigPreferences
914-
, configSolver = projectConfigSolver
915913
, configAllowOlder = projectConfigAllowOlder
916914
, configAllowNewer = projectConfigAllowNewer
917915
, configWriteGhcEnvironmentFilesPolicy =

cabal-install/src/Distribution/Client/Setup.hs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,6 @@ data ConfigExFlags = ConfigExFlags
829829
, configBackup :: Flag Bool
830830
, configExConstraints :: [(UserConstraint, ConstraintSource)]
831831
, configPreferences :: [PackageVersionConstraint]
832-
, configSolver :: Flag PreSolver
833832
, configAllowNewer :: Maybe AllowNewer
834833
, configAllowOlder :: Maybe AllowOlder
835834
, configWriteGhcEnvironmentFilesPolicy
@@ -838,7 +837,7 @@ data ConfigExFlags = ConfigExFlags
838837
deriving (Eq, Show, Generic)
839838

840839
defaultConfigExFlags :: ConfigExFlags
841-
defaultConfigExFlags = mempty{configSolver = Flag defaultSolver}
840+
defaultConfigExFlags = mempty
842841

843842
configureExCommand :: CommandUI (ConfigFlags, ConfigExFlags)
844843
configureExCommand =
@@ -923,7 +922,6 @@ configureExOptions _showOrParseArgs src =
923922
)
924923
(map prettyShow)
925924
)
926-
, optionSolver configSolver (\v flags -> flags{configSolver = v})
927925
, option
928926
[]
929927
["allow-older"]

0 commit comments

Comments
 (0)