Fixups from merge.

Signed-off-by: Edward Z. Yang <[email protected]>
haskell · Aug 11, 2016 · 2640d8d · 2640d8d
1 parent 91019c2
commit 2640d8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/cabal-install/Distribution/Client/ProjectBuilding.hs b/cabal-install/Distribution/Client/ProjectBuilding.hs
@@ -364,7 +364,7 @@ improveInstallPlanWithUpToDatePackages installPlan pkgsBuildStatus =
       [ (installedUnitId pkg, mipkg)
       | InstallPlan.Configured pkg
           <- InstallPlan.reverseTopologicalOrder installPlan
-      , let uid = installedPackageId pkg
+      , let uid = installedUnitId pkg
             Just pkgBuildStatus = Map.lookup uid pkgsBuildStatus
       , BuildStatusUpToDate (BuildResult { buildResultLibInfo = mipkg })
           <- [pkgBuildStatus]
@@ -615,7 +615,7 @@ data BuildResult = BuildResult {
        buildResultDocs    :: DocsResult,
        buildResultTests   :: TestsResult,
        buildResultLogFile :: Maybe FilePath,
-       buildResultLibInfo :: [InstalledPackageInfo]
+       buildResultLibInfo :: Maybe InstalledPackageInfo
      }
   deriving Show
 

diff --git a/cabal-install/Distribution/Client/ProjectOrchestration.hs b/cabal-install/Distribution/Client/ProjectOrchestration.hs
@@ -62,8 +62,7 @@ import           Distribution.Client.ProjectPlanning.Types
 import           Distribution.Client.ProjectBuilding
 
 import           Distribution.Client.Types
-                   ( InstalledPackageId, installedPackageId
-                   , GenericReadyPackage(..), PackageLocation(..) )
+                   ( GenericReadyPackage(..), PackageLocation(..) )
 import qualified Distribution.Client.InstallPlan as InstallPlan
 import           Distribution.Client.BuildTarget
                    ( UserBuildTarget, resolveUserBuildTargets