Update for changes to finalizePackageDescription

cabal-install/Distribution/Client/Configure.hs

@@ -64,7 +64,7 @@ import Distribution.Version
 import Distribution.Simple.Utils as Utils
          ( notice, info, die )
 import Distribution.System
-         ( Platform(Platform), buildPlatform )
+         ( Platform, buildPlatform )
 import Distribution.Verbosity as Verbosity
          ( Verbosity )
 
@@ -191,7 +191,7 @@ configurePackage :: Verbosity
                  -> ConfiguredPackage
                  -> [String]
                  -> IO ()
-configurePackage verbosity (Platform arch os) comp scriptOptions configFlags
+configurePackage verbosity platform comp scriptOptions configFlags
   (ConfiguredPackage (AvailablePackage _ gpkg _) flags deps) extraArgs =
 
   setupWrapper verbosity
@@ -205,7 +205,7 @@ configurePackage verbosity (Platform arch os) comp scriptOptions configFlags
     }
 
     pkg = case finalizePackageDescription flags
-           (Nothing :: Maybe (PackageIndex PackageDescription))
-           os arch comp [] gpkg of
+           (const True)
+           platform comp [] gpkg of
       Left _ -> error "finalizePackageDescription ConfiguredPackage failed"
       Right (desc, _) -> desc

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

@@ -37,8 +37,6 @@ import Distribution.Simple.Utils
          ( comparing )
 import Distribution.Text
          ( display )
-import Distribution.System
-         ( Platform(Platform) )
 
 import Data.List
          ( maximumBy )
@@ -52,7 +50,7 @@ import qualified Data.Map as Map
 -- We just pretend that everything is installed and hope for the best.
 --
 bogusResolver :: DependencyResolver
-bogusResolver (Platform arch os) comp _ available
+bogusResolver platform comp _ available
               preferences constraints targets =
     resolveFromAvailable []
       (combineConstraints preferences constraints targets)
@@ -62,7 +60,7 @@ bogusResolver (Platform arch os) comp _ available
       case latestAvailableSatisfying available name verConstraint verPref of
         Nothing  -> Fail ("Unresolved dependency: " ++ display dep)
         Just apkg@(AvailablePackage _ pkg _) ->
-          case finalizePackageDescription flags none os arch comp [] pkg of
+          case finalizePackageDescription flags none platform comp [] pkg of
             Right (_, flags') -> Step msg (resolveFromAvailable chosen' deps)
               where
                 msg     = "selecting " ++ display (packageId pkg)
@@ -70,8 +68,8 @@ bogusResolver (Platform arch os) comp _ available
                 chosen' = InstallPlan.Configured cpkg : chosen
             _ -> error "bogusResolver: impossible happened"
           where
-            none :: Maybe (PackageIndex PackageIdentifier)
-            none = Nothing
+            none :: Dependency -> Bool
+            none = const True
       where
         dep = Dependency name verConstraint
 

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

@@ -46,7 +46,7 @@ import Distribution.Version
 import Distribution.Compiler
          ( CompilerId )
 import Distribution.System
-         ( Platform(Platform) )
+         ( Platform )
 import Distribution.Simple.Utils
          ( equating, comparing )
 import Distribution.Text
@@ -291,18 +291,21 @@ addTopLevelConstraints (PackageInstalledConstraint pkg:deps) cs =
       Fail (TopLevelInstallConstraintConflict pkg conflicts)
 
 configurePackage :: Platform -> CompilerId -> ConfigurePackage
-configurePackage (Platform arch os) comp available spkg = case spkg of
+configurePackage platform comp available spkg = case spkg of
   InstalledOnly         ipkg      -> Right (InstalledOnly ipkg)
   AvailableOnly              apkg -> fmap AvailableOnly (configure apkg)
   InstalledAndAvailable ipkg apkg -> fmap (InstalledAndAvailable ipkg)
                                           (configure apkg)
   where
   configure (UnconfiguredPackage apkg@(AvailablePackage _ p _) _ flags) =
-    case finalizePackageDescription flags (Just available) os arch comp [] p of
+    case finalizePackageDescription flags dependencySatisfiable
+                                    platform comp [] p of
       Left missing        -> Left missing
       Right (pkg, flags') -> Right $
         SemiConfiguredPackage apkg flags' (buildDepends pkg)
 
+  dependencySatisfiable = not . null . PackageIndex.lookupDependency available
+
 -- | Annotate each installed packages with its set of transative dependencies
 -- and its topological sort number.
 --

cabal-install/Distribution/Client/Install.hs

@@ -110,7 +110,7 @@ import Distribution.Simple.Utils as Utils
 import Distribution.Client.Utils
          ( inDir, mergeBy, MergeResult(..), withTempDirectory )
 import Distribution.System
-         ( Platform(Platform), buildPlatform, OS(Windows), buildOS )
+         ( Platform, buildPlatform, OS(Windows), buildOS )
 import Distribution.Text
          ( display )
 import Distribution.Verbosity as Verbosity
@@ -584,7 +584,7 @@ installConfiguredPackage :: Platform -> CompilerId
                          -> (ConfigFlags -> AvailablePackageSource
                                          -> PackageDescription -> a)
                          -> a
-installConfiguredPackage (Platform arch os) comp configFlags
+installConfiguredPackage platform comp configFlags
   (ConfiguredPackage (AvailablePackage _ gpkg source) flags deps)
   installPkg = installPkg configFlags {
     configConfigurationsFlags = flags,
@@ -592,8 +592,8 @@ installConfiguredPackage (Platform arch os) comp configFlags
   } source pkg
   where
     pkg = case finalizePackageDescription flags
-           (Nothing :: Maybe (PackageIndex PackageDescription))
-           os arch comp [] gpkg of
+           (const True)
+           platform comp [] gpkg of
       Left _ -> error "finalizePackageDescription ConfiguredPackage failed"
       Right (desc, _) -> desc
 

cabal-install/Distribution/Client/InstallPlan.hs

@@ -65,7 +65,7 @@ import qualified Distribution.Simple.PackageIndex as PackageIndex
 import Distribution.Text
          ( display )
 import Distribution.System
-         ( Platform(Platform) )
+         ( Platform )
 import Distribution.Compiler
          ( CompilerId(..) )
 import Distribution.Client.Utils
@@ -455,7 +455,7 @@ showPackageProblem (InvalidDep dep pkgid) =
 
 configuredPackageProblems :: Platform -> CompilerId
                           -> ConfiguredPackage -> [PackageProblem]
-configuredPackageProblems (Platform arch os) comp
+configuredPackageProblems platform comp
   (ConfiguredPackage pkg specifiedFlags specifiedDeps) =
      [ DuplicateFlag flag | ((flag,_):_) <- duplicates specifiedFlags ]
   ++ [ MissingFlag flag | OnlyInLeft  flag <- mergedFlags ]
@@ -487,7 +487,9 @@ configuredPackageProblems (Platform arch os) comp
     requiredDeps =
       --TODO: use something lower level than finalizePackageDescription
       case finalizePackageDescription specifiedFlags
-         (Nothing :: Maybe (PackageIndex PackageIdentifier)) os arch comp []
+         (const True)
+         platform comp
+         []
          (packageDescription pkg) of
         Right (resolvedPkg, _) -> buildDepends resolvedPkg
         Left  _ -> error "configuredPackageInvalidDeps internal error"

cabal-install/Distribution/Client/InstallSymlink.hs

@@ -58,9 +58,6 @@ import Distribution.PackageDescription.Configuration
 import Distribution.Simple.Setup
          ( ConfigFlags(..), fromFlag, fromFlagOrDefault, flagToMaybe )
 import qualified Distribution.Simple.InstallDirs as InstallDirs
-import Distribution.Simple.PackageIndex (PackageIndex)
-import Distribution.System
-         ( Platform(Platform) )
 
 import System.Posix.Files
          ( getSymbolicLinkStatus, isSymbolicLink, createSymbolicLink
@@ -135,8 +132,8 @@ symlinkBinaries configFlags installFlags plan =
     pkgDescription :: ConfiguredPackage -> PackageDescription
     pkgDescription (ConfiguredPackage (AvailablePackage _ pkg _) flags _) =
       case finalizePackageDescription flags
-             (Nothing :: Maybe (PackageIndex PackageDescription))
-             os arch compilerId [] pkg of
+             (const True)
+             platform compilerId [] pkg of
         Left _ -> error "finalizePackageDescription ConfiguredPackage failed"
         Right (desc, _) -> desc
 
@@ -162,7 +159,7 @@ symlinkBinaries configFlags installFlags plan =
     fromFlagTemplate = fromFlagOrDefault (InstallDirs.toPathTemplate "")
     prefixTemplate   = fromFlagTemplate (configProgPrefix configFlags)
     suffixTemplate   = fromFlagTemplate (configProgSuffix configFlags)
-    (Platform arch os) = InstallPlan.planPlatform plan
+    platform         = InstallPlan.planPlatform plan
     compilerId@(CompilerId compilerFlavor _) = InstallPlan.planCompiler plan
 
 symlinkBinary :: FilePath -- ^ The canonical path of the public bin dir