refactor!: remove storePackageDBStack

It is not very useful.

Author: andreabedini

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

@@ -137,6 +137,7 @@ import Distribution.Simple.Compiler
   )
 import Distribution.Simple.Configure
   ( configCompilerEx
+  , interpretPackageDbFlags
   )
 import Distribution.Simple.Flag
   ( flagElim
@@ -1342,7 +1343,8 @@ getPackageDbStack compiler storeDirFlag logsDirFlag packageDbs = do
   let
     mlogsDir = flagToMaybe logsDirFlag
   cabalLayout <- mkCabalDirLayout mstoreDir mlogsDir
-  pure $ storePackageDBStack (cabalStoreDirLayout cabalLayout) compiler packageDbs
+  let storePackageDBStack = interpretPackageDbFlags False packageDbs ++ [storePackageDB (cabalStoreDirLayout cabalLayout) compiler]
+  pure storePackageDBStack
 
 -- | This defines what a 'TargetSelector' means for the @bench@ command.
 -- It selects the 'AvailableTarget's that the 'TargetSelector' refers to,

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

@@ -44,10 +44,8 @@ import Distribution.Simple.Compiler
   ( Compiler (..)
   , OptimisationLevel (..)
   , PackageDBCWD
-  , PackageDBStackCWD
   , PackageDBX (..)
   )
-import Distribution.Simple.Configure (interpretPackageDbFlags)
 import Distribution.System
 import Distribution.Types.ComponentName
 import Distribution.Types.LibraryName
@@ -123,7 +121,6 @@ data StoreDirLayout = StoreDirLayout
   , storePackageDirectory :: Compiler -> UnitId -> FilePath
   , storePackageDBPath :: Compiler -> FilePath
   , storePackageDB :: Compiler -> PackageDBCWD
-  , storePackageDBStack :: Compiler -> [Maybe PackageDBCWD] -> PackageDBStackCWD
   , storeIncomingDirectory :: Compiler -> FilePath
   , storeIncomingLock :: Compiler -> UnitId -> FilePath
   }
@@ -190,7 +187,6 @@ defaultDistDirLayout projectRoot mdistDirectory haddockOutputDir =
     distDirectory =
       distProjectRootDirectory
         </> fromMaybe "dist-newstyle" mdistDirectory
-    -- TODO: switch to just dist at some point, or some other new name
 
     distBuildRootDirectory :: FilePath
     distBuildRootDirectory = distDirectory </> "build"
@@ -287,11 +283,6 @@ defaultStoreDirLayout storeRoot =
     storePackageDB compiler =
       SpecificPackageDB (storePackageDBPath compiler)
 
-    storePackageDBStack :: Compiler -> [Maybe PackageDBCWD] -> PackageDBStackCWD
-    storePackageDBStack compiler extraPackageDB =
-      (interpretPackageDbFlags False extraPackageDB)
-        ++ [storePackageDB compiler]
-
     storeIncomingDirectory :: Compiler -> FilePath
     storeIncomingDirectory compiler =
       storeDirectory compiler </> "incoming"

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

@@ -118,6 +118,7 @@ import Distribution.Compat.Directory (listDirectory)
 
 import Distribution.Client.ProjectBuilding.PackageFileMonitor
 import Distribution.System (Platform(..))
+import Distribution.Simple.Configure (interpretPackageDbFlags)
 
 -- | Each unpacked package is processed in the following phases:
 --
@@ -653,9 +654,7 @@ buildAndInstallUnpackedPackage
 buildAndInstallUnpackedPackage
   verbosity
   distDirLayout
-  storeDirLayout@StoreDirLayout
-    { storePackageDBStack
-    }
+  storeDirLayout
   maybe_semaphore
   buildSettings@BuildTimeSettings{buildSettingNumJobs, buildSettingLogFile}
   registerLock
@@ -753,11 +752,8 @@ buildAndInstallUnpackedPackage
                       "registerPkg: elab does NOT require registration for "
                         ++ prettyShow uid
                 | otherwise = do
-                    assert
-                      ( elabRegisterPackageDBStack pkg
-                          == storePackageDBStack toolchainCompiler (elabPackageDbs pkg)
-                      )
-                      (return ())
+                    let packageDbStack = interpretPackageDbFlags False (elabPackageDbs pkg) ++ [storePackageDB storeDirLayout toolchainCompiler]
+                    assert (elabRegisterPackageDBStack pkg == packageDbStack) (return ())
                     _ <-
                       runRegister
                         (elabRegisterPackageDBStack pkg)

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

@@ -1561,7 +1561,7 @@ elaborateInstallPlan
   toolchains
   pkgConfigDB
   distDirLayout@DistDirLayout{..}
-  storeDirLayout@StoreDirLayout{storePackageDBStack}
+  storeDirLayout
   solverPlan
   localPackages
   sourcePackageHashes
@@ -2224,7 +2224,9 @@ elaborateInstallPlan
 
             inplacePackageDbs = corePackageDbs ++ [distPackageDB (compilerId elabCompiler)]
 
-            corePackageDbs = storePackageDBStack elabCompiler (projectConfigPackageDBs sharedPackageConfig)
+            corePackageDbs = 
+              Cabal.interpretPackageDbFlags False (projectConfigPackageDBs sharedPackageConfig)
+              ++ [storePackageDB storeDirLayout elabCompiler]
 
             elabInplaceBuildPackageDBStack = inplacePackageDbs
             elabInplaceRegisterPackageDBStack = inplacePackageDbs