Add build package index

Author: angerman

cabal-install-solver/src/Distribution/Solver/Modular.hs

@@ -80,14 +80,14 @@ showCP (CP qpi fa es ds) =
 -- | Ties the two worlds together: classic cabal-install vs. the modular
 -- solver. Performs the necessary translations before and after.
 modularResolver :: SolverConfig -> DependencyResolver loc
-modularResolver sc toolchains iidx sidx pkgConfigDB pprefs pcs pns = do
-    (assignment, revdepmap) <- solve' sc toolchains idx pkgConfigDB pprefs gcs pns
+modularResolver sc toolchains biidx iidx sidx pkgConfigDB pprefs pcs pns = do
+    (assignment, revdepmap) <- solve' sc toolchains (trace (showIdx idx) idx) pkgConfigDB pprefs gcs pns
     let cp = toCPs assignment revdepmap
     Step (show (vcat (map showCP cp))) $
         return $ postprocess assignment revdepmap
   where
       -- Indices have to be converted into solver-specific uniform index.
-      idx    = convPIs toolchains gcs (shadowPkgs sc) (strongFlags sc) (solveExecutables sc) iidx sidx
+      idx    = convPIs toolchains gcs (shadowPkgs sc) (strongFlags sc) (solveExecutables sc) biidx iidx sidx
       -- Constraints have to be converted into a finite map indexed by PN.
       gcs    = M.fromListWith (++) (map pair pcs)
         where
@@ -97,7 +97,7 @@ modularResolver sc toolchains iidx sidx pkgConfigDB pprefs pcs pns = do
       -- package qualifiers, which means that linked packages become duplicates
       -- and can be removed.
       postprocess a rdm = ordNubBy nodeKey $
-                          map (convCP iidx sidx) (toCPs a rdm)
+                          map (convCP biidx iidx sidx) (toCPs a rdm)
 
       -- Helper function to extract the PN from a constraint.
       pcName :: PackageConstraint -> PN

cabal-install-solver/src/Distribution/Solver/Modular/ConfiguredConversion.hs

@@ -19,21 +19,23 @@ import           Distribution.Solver.Types.SolverId
 import           Distribution.Solver.Types.SolverPackage
 import           Distribution.Solver.Types.InstSolverPackage
 import           Distribution.Solver.Types.SourcePackage
+import Control.Applicative ((<|>))
 
 -- | Converts from the solver specific result @CP QPN@ into
 -- a 'ResolverPackage', which can then be converted into
 -- the install plan.
-convCP :: SI.InstalledPackageIndex ->
-          CI.PackageIndex (SourcePackage loc) ->
-          CP QPN -> ResolverPackage loc
-convCP iidx sidx (CP qpi fa es ds) =
+convCP :: SI.InstalledPackageIndex -- ^ build
+       -> SI.InstalledPackageIndex -- ^ host
+       -> CI.PackageIndex (SourcePackage loc)
+       -> CP QPN -> ResolverPackage loc
+convCP biidx iidx sidx (CP qpi fa es ds) =
   case qpi of
     -- Installed
     (PI qpn (I _stage _ (Inst pi)))  ->
       PreExisting $
                   InstSolverPackage {
                     instSolverQPN = qpn,
-                    instSolverPkgIPI = fromMaybe (error "convCP: lookupUnitId failed") $ SI.lookupUnitId iidx pi,
+                    instSolverPkgIPI = fromMaybe (error "convCP: lookupUnitId failed") $ (SI.lookupUnitId iidx pi) <|> (SI.lookupUnitId biidx pi),
                     instSolverPkgLibDeps = fmap fst ds',
                     instSolverPkgExeDeps = fmap snd ds'
                   }

cabal-install-solver/src/Distribution/Solver/Modular/IndexConversion.hs

@@ -58,11 +58,14 @@ import Distribution.Solver.Modular.Version
 -- explicitly requested.
 convPIs :: Toolchains -> Map PN [LabeledPackageConstraint]
         -> ShadowPkgs -> StrongFlags -> SolveExecutables
-        -> SI.InstalledPackageIndex -> CI.PackageIndex (SourcePackage loc)
+        -> SI.InstalledPackageIndex -- ^ build
+        -> SI.InstalledPackageIndex -- ^ host
+        -> CI.PackageIndex (SourcePackage loc)
         -> Index
-convPIs toolchains constraints sip strfl solveExes iidx sidx =
-  mkIndex $
-  convIPI' toolchains sip iidx ++ convSPI' toolchains constraints strfl solveExes sidx
+  where bipis = convIPI' toolchains sip biidx
+        hipis = convIPI' toolchains sip iidx
+        ipis = bipis ++ hipis
+        spis = convSPI' toolchains constraints strfl solveExes sidx
 
 -- | Convert a Cabal installed package index to the simpler,
 -- more uniform index format of the solver.

cabal-install-solver/src/Distribution/Solver/Types/DependencyResolver.hs

@@ -28,7 +28,8 @@ import Distribution.System ( Platform )
 -- in alternatives.
 --
 type DependencyResolver loc = Toolchains
-                           -> InstalledPackageIndex
+                           -> InstalledPackageIndex -- ^ build
+                           -> InstalledPackageIndex -- ^ host
                            -> PackageIndex (SourcePackage loc)
                            -> Maybe PkgConfigDb
                            -> (PackageName -> PackagePreferences)

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

@@ -464,6 +464,7 @@ planLocalPackage
           . setSolveExecutables (SolveExecutables False)
           . setSolverVerbosity verbosity
           $ standardInstallPolicy
+            mempty {- build pkgs -}
             installedPkgIndex
             -- NB: We pass in an *empty* source package database,
             -- because cabal configure assumes that all dependencies

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

@@ -181,6 +181,7 @@ data DepResolverParams = DepResolverParams
   , depResolverPreferences :: [PackagePreference]
   , depResolverPreferenceDefault :: PackagesPreferenceDefault
   , depResolverInstalledPkgIndex :: InstalledPackageIndex
+  , depResolverBuildInstalledPkgIndex :: InstalledPackageIndex
   , depResolverSourcePkgIndex :: PackageIndex.PackageIndex UnresolvedSourcePackage
   , depResolverReorderGoals :: ReorderGoals
   , depResolverCountConflicts :: CountConflicts
@@ -277,15 +278,17 @@ showPackagePreference (PackageStanzasPreference pn st) =
 
 basicDepResolverParams
   :: InstalledPackageIndex
+  -> InstalledPackageIndex
   -> PackageIndex.PackageIndex UnresolvedSourcePackage
   -> DepResolverParams
-basicDepResolverParams installedPkgIndex sourcePkgIndex =
+basicDepResolverParams buildInstalledPkgIndex installedPkgIndex sourcePkgIndex=
   DepResolverParams
     { depResolverTargets = Set.empty
     , depResolverConstraints = []
     , depResolverPreferences = []
     , depResolverPreferenceDefault = PreferLatestForSelected
     , depResolverInstalledPkgIndex = installedPkgIndex
+    , depResolverBuildInstalledPkgIndex = buildInstalledPkgIndex
     , depResolverSourcePkgIndex = sourcePkgIndex
     , depResolverReorderGoals = ReorderGoals False
     , depResolverCountConflicts = CountConflicts True
@@ -702,11 +705,13 @@ reinstallTargets params =
 
 -- | A basic solver policy on which all others are built.
 basicInstallPolicy
-  :: InstalledPackageIndex
+  :: InstalledPackageIndex -- ^ Build
+  -> InstalledPackageIndex -- ^ Host
   -> SourcePackageDb
   -> [PackageSpecifier UnresolvedSourcePackage]
   -> DepResolverParams
 basicInstallPolicy
+  binstalledPkgIndex
   installedPkgIndex
   (SourcePackageDb sourcePkgIndex sourcePkgPrefs)
   pkgSpecifiers =
@@ -723,6 +728,7 @@ basicInstallPolicy
       . addSourcePackages
         [pkg | SpecificSourcePackage pkg <- pkgSpecifiers]
       $ basicDepResolverParams
+        binstalledPkgIndex
         installedPkgIndex
         sourcePkgIndex
 
@@ -731,13 +737,15 @@ basicInstallPolicy
 --
 -- It extends the 'basicInstallPolicy' with a policy on setup deps.
 standardInstallPolicy
-  :: InstalledPackageIndex
+  :: InstalledPackageIndex -- ^ Build
+  -> InstalledPackageIndex -- ^ Host
   -> SourcePackageDb
   -> [PackageSpecifier UnresolvedSourcePackage]
   -> DepResolverParams
-standardInstallPolicy installedPkgIndex sourcePkgDb pkgSpecifiers =
+standardInstallPolicy binstalledPkgIndex installedPkgIndex sourcePkgDb pkgSpecifiers =
   addDefaultSetupDependencies mkDefaultSetupDeps $
     basicInstallPolicy
+      binstalledPkgIndex
       installedPkgIndex
       sourcePkgDb
       pkgSpecifiers
@@ -810,6 +818,7 @@ resolveDependencies toolchains pkgConfigDB params =
             (PruneAfterFirstSuccess False)
         )
         toolchains
+        binstalledPkgIndex
         installedPkgIndex
         sourcePkgIndex
         pkgConfigDB
@@ -823,6 +832,7 @@ resolveDependencies toolchains pkgConfigDB params =
                     prefs
                     defpref
                     installedPkgIndex
+                    binstalledPkgIndex
                     sourcePkgIndex
                     reordGoals
                     cntConflicts
@@ -1141,6 +1151,7 @@ resolveWithoutDependencies
       prefs
       defpref
       installedPkgIndex
+      binstalledPkgIndex
       sourcePkgIndex
       _reorderGoals
       _countConflicts

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

@@ -220,7 +220,7 @@ planPackages
           -- already installed. Since we want to get the source packages of
           -- things we might have installed (but not have the sources for).
           . reinstallTargets
-          $ standardInstallPolicy installedPkgIndex sourcePkgDb pkgSpecifiers
+          $ standardInstallPolicy mempty {-build-} installedPkgIndex sourcePkgDb pkgSpecifiers
 
       includeDependencies = fromFlag (fetchDeps fetchFlags)
       logMsg message rest = debug verbosity message >> rest

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

@@ -245,7 +245,7 @@ planPackages
                in LabeledPackageConstraint pc ConstraintSourceFreeze
             | pkgSpecifier <- pkgSpecifiers
             ]
-          $ standardInstallPolicy installedPkgIndex sourcePkgDb pkgSpecifiers
+          $ standardInstallPolicy mempty {- build -} installedPkgIndex sourcePkgDb pkgSpecifiers
 
       logMsg message rest = debug verbosity message >> rest
 

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

@@ -148,7 +148,7 @@ get verbosity repoCtxt globalFlags getFlags userTargets = do
     resolverParams :: SourcePackageDb -> [PackageSpecifier UnresolvedSourcePackage] -> DepResolverParams
     resolverParams sourcePkgDb pkgSpecifiers =
       -- TODO: add command-line constraint and preference args for unpack
-      standardInstallPolicy mempty sourcePkgDb pkgSpecifiers
+      standardInstallPolicy mempty mempty sourcePkgDb pkgSpecifiers
 
     onlyPkgDescr = fromFlagOrDefault False (getOnlyPkgDescr getFlags)
 

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

@@ -650,6 +650,7 @@ planPackages
           -- doesn't understand how to install them
           . setSolveExecutables (SolveExecutables False)
           $ standardInstallPolicy
+            mempty {- build pkgs -}
             installedPkgIndex
             sourcePkgDb
             pkgSpecifiers