refactor(cabal-install): resolve package dbs during planning

Author: andreabedini

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

@@ -219,7 +219,7 @@ data PackageHashConfigInputs = PackageHashConfigInputs
   , pkgHashExtraIncludeDirs :: [FilePath]
   , pkgHashProgPrefix :: Maybe PathTemplate
   , pkgHashProgSuffix :: Maybe PathTemplate
-  , pkgHashPackageDbs :: [Maybe PackageDBCWD]
+  , pkgHashPackageDbs :: [PackageDBCWD]
   , -- Haddock options
     pkgHashDocumentation :: Bool
   , pkgHashHaddockHoogle :: Bool

cabal-install/src/Distribution/Client/ProjectBuilding/UnpackedPackage.hs

@@ -116,7 +116,6 @@ import Distribution.Client.Errors
 import Distribution.Compat.Directory (listDirectory)
 
 import Distribution.Client.ProjectBuilding.PackageFileMonitor
-import Distribution.Simple.Configure (interpretPackageDbFlags)
 
 -- | Each unpacked package is processed in the following phases:
 --
@@ -709,7 +708,7 @@ buildAndInstallUnpackedPackage
                       "registerPkg: elab does NOT require registration for "
                         ++ prettyShow uid
                 | otherwise = do
-                    let packageDbStack = interpretPackageDbFlags False (elabPackageDbs pkg) ++ [storePackageDB storeDirLayout compiler]
+                    let packageDbStack = elabPackageDbs pkg ++ [storePackageDB storeDirLayout compiler]
                     assert (elabRegisterPackageDBStack pkg == packageDbStack) (return ())
                     _ <-
                       runRegister

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

@@ -2271,7 +2271,7 @@ elaborateInstallPlan
               if shouldBuildInplaceOnly pkg
                 then BuildInplaceOnly OnDisk
                 else BuildAndInstall
-            elabPackageDbs = projectConfigPackageDBs sharedPackageConfig
+            elabPackageDbs = Cabal.interpretPackageDbFlags False (projectConfigPackageDBs sharedPackageConfig)
             elabBuildPackageDBStack = buildAndRegisterDbs
             elabRegisterPackageDBStack = buildAndRegisterDbs
 

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

@@ -247,21 +247,20 @@ data ElaboratedConfiguredPackage = ElaboratedConfiguredPackage
   -- to disable. This tells us which ones we build by default, and
   -- helps with error messages when the user asks to build something
   -- they explicitly disabled.
-  --
-  -- TODO: The 'Bool' here should be refined into an ADT with three
-  -- cases: NotRequested, ExplicitlyRequested and
-  -- ImplicitlyRequested.  A stanza is explicitly requested if
-  -- the user asked, for this *specific* package, that the stanza
-  -- be enabled; it's implicitly requested if the user asked for
-  -- all global packages to have this stanza enabled.  The
-  -- difference between an explicit and implicit request is
-  -- error reporting behavior: if a user asks for tests to be
-  -- enabled for a specific package that doesn't have any tests,
-  -- we should warn them about it, but we shouldn't complain
-  -- that a user enabled tests globally, and some local packages
-  -- just happen not to have any tests.  (But perhaps we should
-  -- warn if ALL local packages don't have any tests.)
-  , elabPackageDbs :: [Maybe PackageDBCWD]
+  , -- TODO: The 'Bool' here should be refined into an ADT with three
+    -- cases: NotRequested, ExplicitlyRequested and
+    -- ImplicitlyRequested.  A stanza is explicitly requested if
+    -- the user asked, for this *specific* package, that the stanza
+    -- be enabled; it's implicitly requested if the user asked for
+    -- all global packages to have this stanza enabled.  The
+    -- difference between an explicit and implicit request is
+    -- error reporting behavior: if a user asks for tests to be
+    -- enabled for a specific package that doesn't have any tests,
+    -- we should warn them about it, but we shouldn't complain
+    -- that a user enabled tests globally, and some local packages
+    -- just happen not to have any tests.  (But perhaps we should
+    -- warn if ALL local packages don't have any tests.)
+    elabPackageDbs :: [PackageDBCWD]
   , elabSetupPackageDBStack :: PackageDBStackCWD
   , elabBuildPackageDBStack :: PackageDBStackCWD
   , elabRegisterPackageDBStack :: PackageDBStackCWD