Add --build-package-db.

Author: angerman

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

@@ -576,6 +576,7 @@ instance Semigroup SavedConfig where
           , configBuildHcFlavor = combine configBuildHcFlavor
           , configBuildHcPath = combine configBuildHcPath
           , configBuildHcPkg = combine configBuildHcPkg
+          , configBuildPackageDBs = lastNonEmpty configBuildPackageDBs
           }
         where
           combine = combine' savedConfigureExFlags

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

@@ -705,6 +705,7 @@ convertLegacyAllPackageFlags globalFlags configFlags configExFlags installFlags
   ProjectConfigShared{..}
   where
     projectConfigPackageDBs = (fmap . fmap) (interpretPackageDB Nothing) projectConfigPackageDBs_
+    projectConfigBuildPackageDBs = (fmap . fmap) (interpretPackageDB Nothing) projectConfigBuildPackageDBs_
     projectConfigHookHashes = mempty -- :: Map FilePath HookAccept
     projectConfigDistDir = fmap getSymbolicPath projectConfigAbsoluteDistDir
 
@@ -744,6 +745,7 @@ convertLegacyAllPackageFlags globalFlags configFlags configExFlags installFlags
       , configBuildHcFlavor = projectConfigBuildHcFlavor
       , configBuildHcPath = projectConfigBuildHcPath
       , configBuildHcPkg = projectConfigBuildHcPkg
+      , configBuildPackageDBs = projectConfigBuildPackageDBs_
       } = configExFlags
 
     InstallFlags

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

@@ -202,6 +202,7 @@ data ProjectConfigShared = ProjectConfigShared
 
     projectConfigInstallDirs :: InstallDirs (Flag PathTemplate)
   , projectConfigPackageDBs :: [Maybe PackageDBCWD]
+  , projectConfigBuildPackageDBs :: [Maybe PackageDBCWD]
   , -- configuration used both by the solver and other phases
     projectConfigRemoteRepos :: NubList RemoteRepo
   -- ^ Available Hackage servers.

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

@@ -796,7 +796,7 @@ rebuildInstallPlan
                 getInstalledPackages
                   verbosity
                   (hostToolchain toolchains)
-                  corePackageDbs
+                  (corePackageDbs Host)
               -- this is an aweful hack, however `getInstalledPackages` is
               -- terribly invovled everywhere so we'll have to do with this
               -- for now. FIXME!
@@ -805,7 +805,7 @@ rebuildInstallPlan
                 getInstalledPackages
                   verbosity
                   (buildToolchain toolchains)
-                  corePackageDbs
+                  (corePackageDbs Build)
 
               (sourcePkgDb, tis, ar) <-
                 getSourcePackages
@@ -840,9 +840,13 @@ rebuildInstallPlan
                     dieWithException verbosity $ PhaseRunSolverErr msg
                   Right plan -> return (plan, pkgConfigDB, tis, ar)
           where
-            corePackageDbs :: PackageDBStackCWD
-            corePackageDbs =
-              Cabal.interpretPackageDbFlags False (projectConfigPackageDBs projectConfigShared)
+            corePackageDbs :: Stage -> PackageDBStackCWD
+            corePackageDbs stage =
+              Cabal.interpretPackageDbFlags False (packageDBs stage)
+
+            packageDBs Host = projectConfigPackageDBs projectConfigShared
+            packageDBs Build = projectConfigBuildPackageDBs projectConfigShared
+
 
             withRepoCtx :: (RepoContext -> IO a) -> IO a
             withRepoCtx =
@@ -2323,7 +2327,10 @@ elaborateInstallPlan
 
             inplacePackageDbs stage = corePackageDbs stage ++ [distPackageDB (compilerId (toolchainCompiler (toolchainFor stage toolchains)))]
 
-            corePackageDbs stage = storePackageDBStack (toolchainCompiler (toolchainFor stage toolchains)) (projectConfigPackageDBs sharedPackageConfig)
+            corePackageDbs stage = storePackageDBStack (toolchainCompiler (toolchainFor stage toolchains)) (packageDBs stage)
+
+            packageDBs Host = projectConfigPackageDBs sharedPackageConfig
+            packageDBs Build = projectConfigBuildPackageDBs sharedPackageConfig
 
             elabInplaceBuildPackageDBStack = inplacePackageDbs stage
             elabInplaceRegisterPackageDBStack = inplacePackageDbs stage

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

@@ -923,6 +923,7 @@ data ConfigExFlags = ConfigExFlags
   , configBuildHcFlavor :: Flag CompilerFlavor
   , configBuildHcPath :: Flag FilePath
   , configBuildHcPkg :: Flag FilePath
+  , configBuildPackageDBs :: [Maybe PackageDB]
   }
   deriving (Eq, Show, Generic)
 
@@ -1075,6 +1076,19 @@ configureExOptions _showOrParseArgs src =
       configBuildHcPkg
       (\v flags -> flags{configBuildHcPkg = v})
       (reqArgFlag "PATH")
+  , option
+      ""
+      ["build-package-db"]
+      ( "Append the given package database to the list of package"
+          ++ " databases used (to satisfy dependencies and register into)."
+          ++ " May be a specific file, 'global' or 'user'. The initial list"
+          ++ " is ['global'], ['global', 'user'], or ['global', $sandbox],"
+          ++ " depending on context. Use 'clear' to reset the list to empty."
+          ++ " See the user guide for details."
+      )
+      configBuildPackageDBs
+      (\v flags -> flags{configBuildPackageDBs = v})
+      (reqArg' "DB" readPackageDbList showPackageDbList)
   ]
 
 writeGhcEnvironmentFilesPolicyParser :: ReadE (Flag WriteGhcEnvironmentFilesPolicy)