Add support for Package Indices

Author: angerman

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

@@ -60,6 +60,7 @@ import Distribution.Package
   ( PackageId
   , packageName
   , packageVersion
+  , pkgCompiler
   )
 import Distribution.Simple.Utils
   ( debug
@@ -395,7 +396,7 @@ waitAsyncFetchPackage verbosity downloadMap srcloc =
 packageFile :: Repo -> PackageId -> FilePath
 packageFile repo pkgid =
   packageDir repo pkgid
-    </> prettyShow pkgid
+    </> prettyShow pkgid{pkgCompiler = Nothing}
     <.> "tar.gz"
 
 -- | Generate the full path to the directory where the local cached copy of

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

@@ -244,6 +244,7 @@ import System.FilePath
 import qualified Text.PrettyPrint as Disp
 
 import GHC.Stack (HasCallStack)
+-- import qualified Distribution.Solver.Types.PackageIndex as XXX
 
 -- | Check that an 'ElaboratedConfiguredPackage' actually makes
 -- sense under some 'ElaboratedSharedConfig'.
@@ -833,13 +834,17 @@ rebuildInstallPlan
 
               -- NOTE: sourcePkgDbs is the stuff that we pull from Hackage
               --       and similar Indices!
-              (sourcePkgDb, tis, ar) <-
+              (sourcePkgDb_, tis, ar) <-
                 getSourcePackages
                   verbosity
                   withRepoCtx
                   (solverSettingIndexState solverSettings)
                   (solverSettingActiveRepos solverSettings)
 
+              -- FIXME: we are duplicating the index here, bad for memory use :-/
+              let sourcePkgDb = sourcePkgDb_{packageIndex =  (addCompilerIdToSrcPkg (compilerIdFor Build toolchains) <$> packageIndex sourcePkgDb_)
+                                                          <> (addCompilerIdToSrcPkg (compilerIdFor Host  toolchains) <$> packageIndex sourcePkgDb_) }
+
               pkgConfigDB <- getPkgConfigDb verbosity (toolchainProgramDb $ buildToolchain toolchains)
 
               -- TODO: [code cleanup] it'd be better if the Compiler contained the
@@ -857,6 +862,7 @@ rebuildInstallPlan
                 -- putStrLn $ unlines $ map (prettyShow . IPI.sourcePackageId) $ PI.allPackages hinstalledPkgIndex
                 -- putStrLn "== localPackages"
                 -- putStrLn $ unlines . map (prettyShow . srcpkgPackageId) $ [pkg | SpecificSourcePackage pkg <- localPackages]
+                -- putStrLn $ unlines . take 20 $ map (prettyShow . srcpkgPackageId) (XXX.allPackages (packageIndex sourcePkgDb))
                 planOrError <-
                   foldProgress logMsg (pure . Left) (pure . Right) $
                     planPackages
@@ -880,9 +886,9 @@ rebuildInstallPlan
             addCompilerToSourcePkg compilerId = map (addCompilerId compilerId)
             addCompilerId :: CompilerId -> PackageSpecifier UnresolvedSourcePackage -> PackageSpecifier UnresolvedSourcePackage
             addCompilerId compilerId (NamedPackage name props) = NamedPackage name props
-            addCompilerId compilerId (SpecificSourcePackage pkg) = SpecificSourcePackage (f pkg)
-              where f :: SourcePackage UnresolvedPkgLoc -> SourcePackage UnresolvedPkgLoc
-                    f pkg = pkg{srcpkgPackageId = (srcpkgPackageId pkg){pkgCompiler = Just compilerId}}
+            addCompilerId compilerId (SpecificSourcePackage pkg) = SpecificSourcePackage (addCompilerIdToSrcPkg compilerId pkg)
+            addCompilerIdToSrcPkg :: CompilerId -> SourcePackage UnresolvedPkgLoc -> SourcePackage UnresolvedPkgLoc
+            addCompilerIdToSrcPkg compilerId pkg = pkg{srcpkgPackageId = (srcpkgPackageId pkg){pkgCompiler = Just compilerId}}
             localPackages = (addCompilerToSourcePkg (compilerIdFor Build toolchains) localPackages_)
                          <> (addCompilerToSourcePkg (compilerIdFor Host  toolchains) localPackages_)
             corePackageDbs :: Stage -> PackageDBStackCWD