Merge pull request #4240 from grayjay/rename-install-base-libraries-flag

Rename --install-base-libraries to --allow-boot-library-installs.

Cabal/doc/nix-local-build.rst

@@ -1663,9 +1663,9 @@ Most users generally won't need these.
 
     The command line variant of this field is ``--(no-)strong-flags``.
 
-.. cfg-field:: install-base-libraries: boolean
-               --install-base-libraries
-               --no-install-base-libraries
+.. cfg-field:: allow-boot-library-installs: boolean
+               --allow-boot-library-installs
+               --no-allow-boot-library-installs
     :synopsis: Allow cabal to install or upgrade any package.
 
     :default: False
@@ -1676,7 +1676,7 @@ Most users generally won't need these.
     removes the restriction.
 
     The command line variant of this field is
-    ``--(no-)install-base-libraries``.
+    ``--(no-)allow-boot-library-installs``.
 
 .. cfg-field:: cabal-lib-version: version
                --cabal-lib-version=version

cabal-install/Distribution/Client/Config.hs

@@ -244,7 +244,7 @@ instance Semigroup SavedConfig where
         installIndependentGoals      = combine installIndependentGoals,
         installShadowPkgs            = combine installShadowPkgs,
         installStrongFlags           = combine installStrongFlags,
-        installInstallBaseLibs       = combine installInstallBaseLibs,
+        installAllowBootLibInstalls  = combine installAllowBootLibInstalls,
         installReinstall             = combine installReinstall,
         installAvoidReinstalls       = combine installAvoidReinstalls,
         installOverrideReinstall     = combine installOverrideReinstall,

cabal-install/Distribution/Client/Dependency.hs

@@ -51,7 +51,7 @@ module Distribution.Client.Dependency (
     setAvoidReinstalls,
     setShadowPkgs,
     setStrongFlags,
-    setInstallBaseLibs,
+    setAllowBootLibInstalls,
     setMaxBackjumps,
     setEnableBackjumping,
     setSolveExecutables,
@@ -163,7 +163,7 @@ data DepResolverParams = DepResolverParams {
        depResolverStrongFlags       :: StrongFlags,
 
        -- | Whether to allow base and its dependencies to be installed.
-       depResolverInstallBaseLibs   :: InstallBaseLibs,
+       depResolverAllowBootLibInstalls :: AllowBootLibInstalls,
 
        depResolverMaxBackjumps      :: Maybe Int,
        depResolverEnableBackjumping :: EnableBackjumping,
@@ -193,7 +193,7 @@ showDepResolverParams p =
   ++ "\navoid reinstalls: "  ++ show (asBool (depResolverAvoidReinstalls  p))
   ++ "\nshadow packages: "   ++ show (asBool (depResolverShadowPkgs       p))
   ++ "\nstrong flags: "      ++ show (asBool (depResolverStrongFlags      p))
-  ++ "\ninstall base libraries: " ++ show (asBool (depResolverInstallBaseLibs p))
+  ++ "\nallow boot library installs: " ++ show (asBool (depResolverAllowBootLibInstalls p))
   ++ "\nmax backjumps: "     ++ maybe "infinite" show
                                      (depResolverMaxBackjumps             p)
   where
@@ -248,7 +248,7 @@ basicDepResolverParams installedPkgIndex sourcePkgIndex =
        depResolverAvoidReinstalls   = AvoidReinstalls False,
        depResolverShadowPkgs        = ShadowPkgs False,
        depResolverStrongFlags       = StrongFlags False,
-       depResolverInstallBaseLibs   = InstallBaseLibs False,
+       depResolverAllowBootLibInstalls = AllowBootLibInstalls False,
        depResolverMaxBackjumps      = Nothing,
        depResolverEnableBackjumping = EnableBackjumping True,
        depResolverSolveExecutables  = SolveExecutables True,
@@ -321,10 +321,10 @@ setStrongFlags sf params =
       depResolverStrongFlags = sf
     }
 
-setInstallBaseLibs :: InstallBaseLibs -> DepResolverParams -> DepResolverParams
-setInstallBaseLibs i params =
+setAllowBootLibInstalls :: AllowBootLibInstalls -> DepResolverParams -> DepResolverParams
+setAllowBootLibInstalls i params =
     params {
-      depResolverInstallBaseLibs = i
+      depResolverAllowBootLibInstalls = i
     }
 
 setMaxBackjumps :: Maybe Int -> DepResolverParams -> DepResolverParams
@@ -662,7 +662,7 @@ resolveDependencies platform comp pkgConfigDB solver params =
   $ fmap (validateSolverResult platform comp indGoals)
   $ runSolver solver (SolverConfig reordGoals cntConflicts
                       indGoals noReinstalls
-                      shadowing strFlags installBase maxBkjumps enableBj
+                      shadowing strFlags allowBootLibs maxBkjumps enableBj
                       solveExes order)
                      platform comp installedPkgIndex sourcePkgIndex
                      pkgConfigDB preferences constraints targets
@@ -679,11 +679,11 @@ resolveDependencies platform comp pkgConfigDB solver params =
       noReinstalls
       shadowing
       strFlags
-      installBase
+      allowBootLibs
       maxBkjumps
       enableBj
       solveExes
-      order) = if asBool (depResolverInstallBaseLibs params)
+      order) = if asBool (depResolverAllowBootLibInstalls params)
                then params
                else dontUpgradeNonUpgradeablePackages params
 
@@ -911,7 +911,7 @@ resolveWithoutDependencies (DepResolverParams targets constraints
                               prefs defpref installedPkgIndex sourcePkgIndex
                               _reorderGoals _countConflicts _indGoals _avoidReinstalls
                               _shadowing _strFlags _maxBjumps _enableBj
-                              _solveExes _installBaseLibs _order) =
+                              _solveExes _allowBootLibInstalls _order) =
     collectEithers $ map selectPackage (Set.toList targets)
   where
     selectPackage :: PackageName -> Either ResolveNoDepsError UnresolvedSourcePackage

cabal-install/Distribution/Client/Fetch.hs

@@ -164,7 +164,7 @@ planPackages verbosity comp platform fetchFlags
 
       . setStrongFlags strongFlags
 
-      . setInstallBaseLibs installBaseLibs
+      . setAllowBootLibInstalls allowBootLibInstalls
 
         -- Reinstall the targets given on the command line so that the dep
         -- resolver will decide that they need fetching, even if they're
@@ -183,7 +183,7 @@ planPackages verbosity comp platform fetchFlags
     shadowPkgs       = fromFlag (fetchShadowPkgs       fetchFlags)
     strongFlags      = fromFlag (fetchStrongFlags      fetchFlags)
     maxBackjumps     = fromFlag (fetchMaxBackjumps     fetchFlags)
-    installBaseLibs  = fromFlag (fetchInstallBaseLibs  fetchFlags)
+    allowBootLibInstalls = fromFlag (fetchAllowBootLibInstalls fetchFlags)
 
 
 checkTarget :: UserTarget -> IO ()

cabal-install/Distribution/Client/Freeze.hs

@@ -179,7 +179,7 @@ planPackages verbosity comp platform mSandboxPkgInfo freezeFlags
 
       . setStrongFlags strongFlags
 
-      . setInstallBaseLibs installBaseLibs
+      . setAllowBootLibInstalls allowBootLibInstalls
 
       . addConstraints
           [ let pkg = pkgSpecifierTarget pkgSpecifier
@@ -205,7 +205,7 @@ planPackages verbosity comp platform mSandboxPkgInfo freezeFlags
     shadowPkgs       = fromFlag (freezeShadowPkgs       freezeFlags)
     strongFlags      = fromFlag (freezeStrongFlags      freezeFlags)
     maxBackjumps     = fromFlag (freezeMaxBackjumps     freezeFlags)
-    installBaseLibs  = fromFlag (freezeInstallBaseLibs  freezeFlags)
+    allowBootLibInstalls = fromFlag (freezeAllowBootLibInstalls freezeFlags)
 
 
 -- | Remove all unneeded packages from an install plan.

cabal-install/Distribution/Client/Install.hs

@@ -388,7 +388,7 @@ planPackages comp platform mSandboxPkgInfo solver
 
       . setStrongFlags strongFlags
 
-      . setInstallBaseLibs installBaseLibs
+      . setAllowBootLibInstalls allowBootLibInstalls
 
       . setPreferenceDefault (if upgradeDeps then PreferAllLatest
                                              else PreferLatestForSelected)
@@ -449,7 +449,7 @@ planPackages comp platform mSandboxPkgInfo solver
     shadowPkgs       = fromFlag (installShadowPkgs        installFlags)
     strongFlags      = fromFlag (installStrongFlags       installFlags)
     maxBackjumps     = fromFlag (installMaxBackjumps      installFlags)
-    installBaseLibs  = fromFlag (installInstallBaseLibs   installFlags)
+    allowBootLibInstalls = fromFlag (installAllowBootLibInstalls installFlags)
     upgradeDeps      = fromFlag (installUpgradeDeps       installFlags)
     onlyDeps         = fromFlag (installOnlyDeps          installFlags)
     allowOlder       = fromMaybe (AllowOlder RelaxDepsNone)

cabal-install/Distribution/Client/ProjectConfig.hs

@@ -202,7 +202,7 @@ resolveSolverSettings ProjectConfig{
     solverSettingReorderGoals      = fromFlag projectConfigReorderGoals
     solverSettingCountConflicts    = fromFlag projectConfigCountConflicts
     solverSettingStrongFlags       = fromFlag projectConfigStrongFlags
-    solverSettingInstallBaseLibs   = fromFlag projectConfigInstallBaseLibs
+    solverSettingAllowBootLibInstalls = fromFlag projectConfigAllowBootLibInstalls
     solverSettingIndexState        = fromFlagOrDefault IndexStateHead projectConfigIndexState
   --solverSettingIndependentGoals  = fromFlag projectConfigIndependentGoals
   --solverSettingShadowPkgs        = fromFlag projectConfigShadowPkgs
@@ -221,7 +221,7 @@ resolveSolverSettings ProjectConfig{
        projectConfigReorderGoals      = Flag (ReorderGoals False),
        projectConfigCountConflicts    = Flag (CountConflicts True),
        projectConfigStrongFlags       = Flag (StrongFlags False),
-       projectConfigInstallBaseLibs   = Flag (InstallBaseLibs False)
+       projectConfigAllowBootLibInstalls = Flag (AllowBootLibInstalls False)
      --projectConfigIndependentGoals  = Flag False,
      --projectConfigShadowPkgs        = Flag False,
      --projectConfigReinstall         = Flag False,

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

@@ -306,7 +306,7 @@ convertLegacyAllPackageFlags globalFlags configFlags
     --installIndependentGoals   = projectConfigIndependentGoals,
     --installShadowPkgs         = projectConfigShadowPkgs,
       installStrongFlags        = projectConfigStrongFlags,
-      installInstallBaseLibs    = projectConfigInstallBaseLibs
+      installAllowBootLibInstalls = projectConfigAllowBootLibInstalls
     } = installFlags
 
 
@@ -503,7 +503,7 @@ convertToLegacySharedConfig
       installIndependentGoals  = mempty, --projectConfigIndependentGoals,
       installShadowPkgs        = mempty, --projectConfigShadowPkgs,
       installStrongFlags       = projectConfigStrongFlags,
-      installInstallBaseLibs   = projectConfigInstallBaseLibs,
+      installAllowBootLibInstalls = projectConfigAllowBootLibInstalls,
       installOnly              = mempty,
       installOnlyDeps          = projectConfigOnlyDeps,
       installIndexState        = projectConfigIndexState,
@@ -854,7 +854,7 @@ legacySharedConfigFieldDescrs =
       , "one-shot", "jobs", "keep-going", "offline"
         -- solver flags:
       , "max-backjumps", "reorder-goals", "count-conflicts", "strong-flags"
-      , "install-base-libraries", "index-state"
+      , "allow-boot-library-installs", "index-state"
       ]
   . commandOptionsToFields
   ) (installOptions ParseArgs)

cabal-install/Distribution/Client/ProjectConfig/Types.hs

@@ -182,7 +182,7 @@ data ProjectConfigShared
        projectConfigReorderGoals      :: Flag ReorderGoals,
        projectConfigCountConflicts    :: Flag CountConflicts,
        projectConfigStrongFlags       :: Flag StrongFlags,
-       projectConfigInstallBaseLibs   :: Flag InstallBaseLibs
+       projectConfigAllowBootLibInstalls :: Flag AllowBootLibInstalls
 
        -- More things that only make sense for manual mode, not --local mode
        -- too much control!
@@ -356,7 +356,7 @@ data SolverSettings
        solverSettingReorderGoals      :: ReorderGoals,
        solverSettingCountConflicts    :: CountConflicts,
        solverSettingStrongFlags       :: StrongFlags,
-       solverSettingInstallBaseLibs   :: InstallBaseLibs,
+       solverSettingAllowBootLibInstalls :: AllowBootLibInstalls,
        solverSettingIndexState        :: IndexState
        -- Things that only make sense for manual mode, not --local mode
        -- too much control!

cabal-install/Distribution/Client/ProjectPlanning.hs

@@ -931,7 +931,7 @@ planPackages comp platform solver SolverSettings{..}
 
       . setStrongFlags solverSettingStrongFlags
 
-      . setInstallBaseLibs solverSettingInstallBaseLibs
+      . setAllowBootLibInstalls solverSettingAllowBootLibInstalls
 
         --TODO: [required eventually] decide if we need to prefer installed for
         -- global packages, or prefer latest even for global packages. Perhaps

cabal-install/Distribution/Client/Setup.hs

@@ -679,7 +679,7 @@ data FetchFlags = FetchFlags {
       fetchIndependentGoals :: Flag IndependentGoals,
       fetchShadowPkgs       :: Flag ShadowPkgs,
       fetchStrongFlags      :: Flag StrongFlags,
-      fetchInstallBaseLibs  :: Flag InstallBaseLibs,
+      fetchAllowBootLibInstalls :: Flag AllowBootLibInstalls,
       fetchVerbosity :: Flag Verbosity
     }
 
@@ -695,7 +695,7 @@ defaultFetchFlags = FetchFlags {
     fetchIndependentGoals = Flag (IndependentGoals False),
     fetchShadowPkgs       = Flag (ShadowPkgs False),
     fetchStrongFlags      = Flag (StrongFlags False),
-    fetchInstallBaseLibs  = Flag (InstallBaseLibs False),
+    fetchAllowBootLibInstalls = Flag (AllowBootLibInstalls False),
     fetchVerbosity = toFlag normal
    }
 
@@ -743,7 +743,7 @@ fetchCommand = CommandUI {
                          fetchIndependentGoals (\v flags -> flags { fetchIndependentGoals = v })
                          fetchShadowPkgs       (\v flags -> flags { fetchShadowPkgs       = v })
                          fetchStrongFlags      (\v flags -> flags { fetchStrongFlags      = v })
-                         fetchInstallBaseLibs  (\v flags -> flags { fetchInstallBaseLibs  = v })
+                         fetchAllowBootLibInstalls (\v flags -> flags { fetchAllowBootLibInstalls = v })
 
   }
 
@@ -762,7 +762,7 @@ data FreezeFlags = FreezeFlags {
       freezeIndependentGoals :: Flag IndependentGoals,
       freezeShadowPkgs       :: Flag ShadowPkgs,
       freezeStrongFlags      :: Flag StrongFlags,
-      freezeInstallBaseLibs  :: Flag InstallBaseLibs,
+      freezeAllowBootLibInstalls :: Flag AllowBootLibInstalls,
       freezeVerbosity        :: Flag Verbosity
     }
 
@@ -778,7 +778,7 @@ defaultFreezeFlags = FreezeFlags {
     freezeIndependentGoals = Flag (IndependentGoals False),
     freezeShadowPkgs       = Flag (ShadowPkgs False),
     freezeStrongFlags      = Flag (StrongFlags False),
-    freezeInstallBaseLibs  = Flag (InstallBaseLibs False),
+    freezeAllowBootLibInstalls = Flag (AllowBootLibInstalls False),
     freezeVerbosity        = toFlag normal
    }
 
@@ -825,7 +825,7 @@ freezeCommand = CommandUI {
                          freezeIndependentGoals (\v flags -> flags { freezeIndependentGoals = v })
                          freezeShadowPkgs       (\v flags -> flags { freezeShadowPkgs       = v })
                          freezeStrongFlags      (\v flags -> flags { freezeStrongFlags      = v })
-                         freezeInstallBaseLibs  (\v flags -> flags { freezeInstallBaseLibs  = v })
+                         freezeAllowBootLibInstalls (\v flags -> flags { freezeAllowBootLibInstalls = v })
 
   }
 
@@ -1245,7 +1245,7 @@ data InstallFlags = InstallFlags {
     installIndependentGoals :: Flag IndependentGoals,
     installShadowPkgs       :: Flag ShadowPkgs,
     installStrongFlags      :: Flag StrongFlags,
-    installInstallBaseLibs  :: Flag InstallBaseLibs,
+    installAllowBootLibInstalls :: Flag AllowBootLibInstalls,
     installReinstall        :: Flag Bool,
     installAvoidReinstalls  :: Flag AvoidReinstalls,
     installOverrideReinstall :: Flag Bool,
@@ -1288,7 +1288,7 @@ defaultInstallFlags = InstallFlags {
     installIndependentGoals= Flag (IndependentGoals False),
     installShadowPkgs      = Flag (ShadowPkgs False),
     installStrongFlags     = Flag (StrongFlags False),
-    installInstallBaseLibs = Flag (InstallBaseLibs False),
+    installAllowBootLibInstalls = Flag (AllowBootLibInstalls False),
     installReinstall       = Flag False,
     installAvoidReinstalls = Flag (AvoidReinstalls False),
     installOverrideReinstall = Flag False,
@@ -1437,7 +1437,7 @@ installOptions showOrParseArgs =
                         installIndependentGoals (\v flags -> flags { installIndependentGoals = v })
                         installShadowPkgs       (\v flags -> flags { installShadowPkgs       = v })
                         installStrongFlags      (\v flags -> flags { installStrongFlags      = v })
-                        installInstallBaseLibs  (\v flags -> flags { installInstallBaseLibs  = v }) ++
+                        installAllowBootLibInstalls (\v flags -> flags { installAllowBootLibInstalls = v }) ++
 
       [ option [] ["reinstall"]
           "Install even if it means installing the same version again."
@@ -2222,7 +2222,7 @@ optionSolverFlags :: ShowOrParseArgs
                   -> (flags -> Flag IndependentGoals) -> (Flag IndependentGoals -> flags -> flags)
                   -> (flags -> Flag ShadowPkgs)       -> (Flag ShadowPkgs       -> flags -> flags)
                   -> (flags -> Flag StrongFlags)      -> (Flag StrongFlags      -> flags -> flags)
-                  -> (flags -> Flag InstallBaseLibs)  -> (Flag InstallBaseLibs  -> flags -> flags)
+                  -> (flags -> Flag AllowBootLibInstalls) -> (Flag AllowBootLibInstalls -> flags -> flags)
                   -> [OptionField flags]
 optionSolverFlags showOrParseArgs getmbj setmbj getrg setrg getcc setcc _getig _setig
                   getsip setsip getstrfl setstrfl getib setib =
@@ -2259,10 +2259,10 @@ optionSolverFlags showOrParseArgs getmbj setmbj getrg setrg getcc setcc _getig _
       (fmap asBool . getstrfl)
       (setstrfl . fmap StrongFlags)
       (yesNoOpt showOrParseArgs)
-  , option [] ["install-base-libraries"]
+  , option [] ["allow-boot-library-installs"]
       "Allow cabal to install base, ghc-prim, integer-simple, integer-gmp, and template-haskell."
       (fmap asBool . getib)
-      (setib . fmap InstallBaseLibs)
+      (setib . fmap AllowBootLibInstalls)
       (yesNoOpt showOrParseArgs)
   ]
 

cabal-install/Distribution/Solver/Modular/Solver.hs

@@ -60,7 +60,7 @@ data SolverConfig = SolverConfig {
   avoidReinstalls       :: AvoidReinstalls,
   shadowPkgs            :: ShadowPkgs,
   strongFlags           :: StrongFlags,
-  installBaseLibs       :: InstallBaseLibs,
+  allowBootLibInstalls  :: AllowBootLibInstalls,
   maxBackjumps          :: Maybe Int,
   enableBackjumping     :: EnableBackjumping,
   solveExecutables      :: SolveExecutables,
@@ -115,7 +115,7 @@ solve sc cinfo idx pkgConfigDB userPrefs userConstraints userGoals =
                        validateLinking idx .
                        validateTree cinfo idx pkgConfigDB
     prunePhase       = (if asBool (avoidReinstalls sc) then P.avoidReinstalls (const True) else id) .
-                       (if asBool (installBaseLibs sc)
+                       (if asBool (allowBootLibInstalls sc)
                         then id
                         else P.requireInstalled (`elem` nonInstallable))
     buildPhase       = traceTree "build.json" id

cabal-install/Distribution/Solver/Types/Settings.hs

@@ -6,7 +6,7 @@ module Distribution.Solver.Types.Settings
     , AvoidReinstalls(..)
     , ShadowPkgs(..)
     , StrongFlags(..)
-    , InstallBaseLibs(..)
+    , AllowBootLibInstalls(..)
     , EnableBackjumping(..)
     , CountConflicts(..)
     , SolveExecutables(..)
@@ -34,7 +34,7 @@ newtype ShadowPkgs = ShadowPkgs Bool
 newtype StrongFlags = StrongFlags Bool
   deriving (BooleanFlag, Eq, Generic, Show)
 
-newtype InstallBaseLibs = InstallBaseLibs Bool
+newtype AllowBootLibInstalls = AllowBootLibInstalls Bool
   deriving (BooleanFlag, Eq, Generic, Show)
 
 newtype EnableBackjumping = EnableBackjumping Bool
@@ -49,5 +49,5 @@ instance Binary IndependentGoals
 instance Binary AvoidReinstalls
 instance Binary ShadowPkgs
 instance Binary StrongFlags
-instance Binary InstallBaseLibs
+instance Binary AllowBootLibInstalls
 instance Binary SolveExecutables

cabal-install/changelog

@@ -32,8 +32,8 @@
 	* Support the Nix package manager (#3651).
 	* Made the 'template-haskell' package non-upgradable again (#4185).
 	* Fixed password echoing on MinTTY (#4128).
-	* Added a new solver flag, '--install-base-libraries', that allows
-	any package to be installed or upgraded (#4209).
+	* Added a new solver flag, '--allow-boot-library-installs', that
+	allows any package to be installed or upgraded (#4209).
 
 1.24.0.0 Ryan Thomas <ryan@ryant.org> March 2016
 	* If there are multiple remote repos, 'cabal update' now updates

cabal-install/tests/UnitTests/Distribution/Client/ProjectConfig.hs

@@ -604,8 +604,8 @@ instance Arbitrary CountConflicts where
 instance Arbitrary StrongFlags where
     arbitrary = StrongFlags <$> arbitrary
 
-instance Arbitrary InstallBaseLibs where
-    arbitrary = InstallBaseLibs <$> arbitrary
+instance Arbitrary AllowBootLibInstalls where
+    arbitrary = AllowBootLibInstalls <$> arbitrary
 
 instance Arbitrary AllowNewer where
     arbitrary = AllowNewer <$> arbitrary

cabal-install/tests/UnitTests/Distribution/Solver/Modular/DSL.hs

@@ -523,14 +523,14 @@ exResolve :: ExampleDb
           -> Maybe Int
           -> IndependentGoals
           -> ReorderGoals
-          -> InstallBaseLibs
+          -> AllowBootLibInstalls
           -> EnableBackjumping
           -> Maybe [ExampleVar]
           -> [ExPreference]
           -> EnableAllTests
           -> Progress String String CI.SolverInstallPlan.SolverInstallPlan
 exResolve db exts langs pkgConfigDb targets solver mbj indepGoals reorder
-          installBaseLibs enableBj vars prefs enableAllTests
+          allowBootLibInstalls enableBj vars prefs enableAllTests
     = resolveDependencies C.buildPlatform compiler pkgConfigDb solver params
   where
     defaultCompiler = C.unknownCompilerInfo C.buildCompilerId C.NoAbiTag
@@ -555,7 +555,7 @@ exResolve db exts langs pkgConfigDb targets solver mbj indepGoals reorder
                    $ setIndependentGoals indepGoals
                    $ setReorderGoals reorder
                    $ setMaxBackjumps mbj
-                   $ setInstallBaseLibs installBaseLibs
+                   $ setAllowBootLibInstalls allowBootLibInstalls
                    $ setEnableBackjumping enableBj
                    $ setGoalOrder goalOrder
                    $ standardInstallPolicy instIdx avaiIdx targets'

cabal-install/tests/UnitTests/Distribution/Solver/Modular/DSL/TestCaseUtils.hs

@@ -4,7 +4,7 @@ module UnitTests.Distribution.Solver.Modular.DSL.TestCaseUtils (
     SolverTest
   , SolverResult(..)
   , independentGoals
-  , installBaseLibs
+  , allowBootLibInstalls
   , disableBackjumping
   , goalOrder
   , preferences
@@ -41,8 +41,9 @@ import UnitTests.Options
 independentGoals :: SolverTest -> SolverTest
 independentGoals test = test { testIndepGoals = IndependentGoals True }
 
-installBaseLibs :: SolverTest -> SolverTest
-installBaseLibs test = test { testInstallBaseLibs = InstallBaseLibs True }
+allowBootLibInstalls :: SolverTest -> SolverTest
+allowBootLibInstalls test =
+    test { testAllowBootLibInstalls = AllowBootLibInstalls True }
 
 disableBackjumping :: SolverTest -> SolverTest
 disableBackjumping test =
@@ -66,7 +67,7 @@ data SolverTest = SolverTest {
   , testTargets        :: [String]
   , testResult         :: SolverResult
   , testIndepGoals     :: IndependentGoals
-  , testInstallBaseLibs :: InstallBaseLibs
+  , testAllowBootLibInstalls :: AllowBootLibInstalls
   , testEnableBackjumping :: EnableBackjumping
   , testGoalOrder      :: Maybe [ExampleVar]
   , testSoftConstraints :: [ExPreference]
@@ -156,7 +157,7 @@ mkTestExtLangPC exts langs pkgConfigDb db label targets result = SolverTest {
   , testTargets        = targets
   , testResult         = result
   , testIndepGoals     = IndependentGoals False
-  , testInstallBaseLibs = InstallBaseLibs False
+  , testAllowBootLibInstalls = AllowBootLibInstalls False
   , testEnableBackjumping = EnableBackjumping True
   , testGoalOrder      = Nothing
   , testSoftConstraints = []
@@ -173,7 +174,7 @@ runTest SolverTest{..} = askOption $ \(OptionShowSolverLog showSolverLog) ->
       let progress = exResolve testDb testSupportedExts
                      testSupportedLangs testPkgConfigDb testTargets
                      Modular Nothing testIndepGoals (ReorderGoals False)
-                     testInstallBaseLibs testEnableBackjumping testGoalOrder
+                     testAllowBootLibInstalls testEnableBackjumping testGoalOrder
                      testSoftConstraints testEnableAllTests
           printMsg msg = if showSolverLog
                          then putStrLn msg

cabal-install/tests/UnitTests/Distribution/Solver/Modular/QuickCheck.hs

@@ -108,7 +108,7 @@ solve enableBj reorder indep solver targets (TestDb db) =
                   -- The backjump limit prevents individual tests from using
                   -- too much time and memory.
                   (Just defaultMaxBackjumps)
-                  indep reorder (InstallBaseLibs False) enableBj Nothing []
+                  indep reorder (AllowBootLibInstalls False) enableBj Nothing []
                   (EnableAllTests True)
 
       failure :: String -> Failure

cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs

@@ -78,9 +78,9 @@ tests = [
         , runTest $ mkTest db12 "baseShim6" ["E"] (solverSuccess [("E", 1), ("syb", 2)])
         ]
     , testGroup "Base" [
-          runTest $ mkTest dbBase "Refuse to install base without --install-base-libraries" ["base"] $
+          runTest $ mkTest dbBase "Refuse to install base without --allow-boot-library-installs" ["base"] $
                       solverFailure (isInfixOf "only already installed instances can be used")
-        , runTest $ installBaseLibs $ mkTest dbBase "Install base with --install-base-libraries" ["base"] $
+        , runTest $ allowBootLibInstalls $ mkTest dbBase "Install base with --allow-boot-library-installs" ["base"] $
                       solverSuccess [("base", 1), ("ghc-prim", 1), ("integer-gmp", 1), ("integer-simple", 1)]
         ]
     , testGroup "Cycles" [