feat: add --build-packagedb

Author: andreabedini

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

@@ -575,6 +575,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
@@ -1026,6 +1028,7 @@ convertToLegacySharedConfig
           , configBuildHcFlavor = projectConfigBuildHcFlavor
           , configBuildHcPath = projectConfigBuildHcPath
           , configBuildHcPkg = projectConfigBuildHcPkg
+          , configBuildPackageDBs = fmap (fmap (fmap unsafeMakeSymbolicPath)) projectConfigBuildPackageDBs
           }
 
       installFlags =

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

@@ -192,16 +192,17 @@ data ProjectConfigShared = ProjectConfigShared
   , projectConfigHcFlavor :: Flag CompilerFlavor
   , projectConfigHcPath :: Flag FilePath
   , projectConfigHcPkg :: Flag FilePath
+  , projectConfigPackageDBs :: [Maybe PackageDBCWD]
   , projectConfigBuildHcFlavor :: Flag CompilerFlavor
   , projectConfigBuildHcPath :: Flag FilePath
   , projectConfigBuildHcPkg :: Flag FilePath
+  , projectConfigBuildPackageDBs :: [Maybe PackageDBCWD]
   , projectConfigHaddockIndex :: Flag PathTemplate
   , -- Only makes sense for manual mode, not --local mode
     -- too much control!
     -- projectConfigUserInstall       :: Flag Bool,
 
     projectConfigInstallDirs :: InstallDirs (Flag PathTemplate)
-  , projectConfigPackageDBs :: [Maybe PackageDBCWD]
   , -- configuration used both by the solver and other phases
     projectConfigRemoteRepos :: NubList RemoteRepo
   -- ^ Available Hackage servers.

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

@@ -923,6 +923,8 @@ data ConfigExFlags = ConfigExFlags
   , configBuildHcFlavor :: Flag CompilerFlavor
   , configBuildHcPath :: Flag FilePath
   , configBuildHcPkg :: Flag FilePath
+  , configBuildPackageDBs :: [Maybe PackageDB]
+  -- ^ Which package DBs to use in the build stage
   }
   deriving (Eq, Show, Generic)
 
@@ -1064,6 +1066,16 @@ 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 during the build stage."
+          ++ " See the user guide for details."
+      )
+      configBuildPackageDBs
+      (\v flags -> flags{configBuildPackageDBs = v})
+      (reqArg' "DB" readPackageDbList showPackageDbList)
   ]
 
 writeGhcEnvironmentFilesPolicyParser :: ReadE (Flag WriteGhcEnvironmentFilesPolicy)

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

@@ -613,12 +613,13 @@ instance Arbitrary ProjectConfigShared where
     projectConfigHcFlavor <- arbitrary
     projectConfigHcPath <- arbitraryFlag arbitraryShortToken
     projectConfigHcPkg <- arbitraryFlag arbitraryShortToken
+    projectConfigPackageDBs <- shortListOf 2 arbitrary
     projectConfigBuildHcFlavor <- arbitrary
     projectConfigBuildHcPath <- arbitraryFlag arbitraryShortToken
     projectConfigBuildHcPkg <- arbitraryFlag arbitraryShortToken
+    projectConfigBuildPackageDBs <- shortListOf 2 arbitrary
     projectConfigHaddockIndex <- arbitrary
     projectConfigInstallDirs <- fixInstallDirs <$> arbitrary
-    projectConfigPackageDBs <- shortListOf 2 arbitrary
     projectConfigRemoteRepos <- arbitrary
     projectConfigLocalNoIndexRepos <- arbitrary
     projectConfigActiveRepos <- arbitrary
@@ -662,12 +663,13 @@ instance Arbitrary ProjectConfigShared where
         <*> shrinker projectConfigHcFlavor
         <*> shrinkerAla (fmap NonEmpty) projectConfigHcPath
         <*> shrinkerAla (fmap NonEmpty) projectConfigHcPkg
+        <*> shrinker projectConfigPackageDBs
         <*> shrinker projectConfigBuildHcFlavor
         <*> shrinkerAla (fmap NonEmpty) projectConfigBuildHcPath
         <*> shrinkerAla (fmap NonEmpty) projectConfigBuildHcPkg
+        <*> shrinker projectConfigBuildPackageDBs
         <*> shrinker projectConfigHaddockIndex
         <*> shrinker projectConfigInstallDirs
-        <*> shrinker projectConfigPackageDBs
         <*> shrinker projectConfigRemoteRepos
         <*> shrinker projectConfigLocalNoIndexRepos
         <*> shrinker projectConfigActiveRepos