Commit fcafa4b9 authored by Duncan Coutts's avatar Duncan Coutts
Browse files

Update for FlagAssignment changes

parent 70ce33c9
......@@ -23,6 +23,8 @@ module Hackage.DepGraph (
import Hackage.Types
import Distribution.Package
( PackageIdentifier, Package(..), PackageFixedDeps(..) )
import Distribution.PackageDescription
( FlagAssignment )
import Distribution.Text
( display )
import Distribution.Simple.Utils
......
......@@ -22,12 +22,12 @@ import qualified Distribution.Simple.PackageIndex as PackageIndex
import Distribution.Simple.PackageIndex (PackageIndex)
import Distribution.InstalledPackageInfo (InstalledPackageInfo)
import qualified Hackage.DepGraph as DepGraph
import Hackage.Types (UnresolvedDependency(..),
PkgInfo(..), FlagAssignment)
import Hackage.Types
( UnresolvedDependency(..), PkgInfo(..) )
import Distribution.Package (PackageIdentifier(..), Package(..), Dependency(..))
import Distribution.PackageDescription
(PackageDescription(buildDepends)
, GenericPackageDescription )
( PackageDescription(buildDepends), GenericPackageDescription
, FlagAssignment )
import Distribution.PackageDescription.Configuration
( finalizePackageDescription)
import Distribution.Compiler
......
......@@ -29,8 +29,8 @@ import qualified Hackage.IndexUtils as IndexUtils
import qualified Hackage.DepGraph as DepGraph
import Hackage.Setup (InstallFlags(..))
import Hackage.Tar (extractTarGzFile)
import Hackage.Types (UnresolvedDependency(..), PkgInfo(..), FlagAssignment,
Repo)
import Hackage.Types
( UnresolvedDependency(..), PkgInfo(..), Repo )
import Hackage.Utils (showDependencies)
import Paths_cabal_install (getBinDir)
......@@ -45,7 +45,8 @@ import Distribution.Simple.Utils
( defaultPackageDesc, inDir, rawSystemExit, withTempDirectory )
import Distribution.Package
( PackageIdentifier(..), Package(..) )
import Distribution.PackageDescription (GenericPackageDescription(packageDescription))
import Distribution.PackageDescription
( GenericPackageDescription(packageDescription), FlagAssignment )
import Distribution.PackageDescription.Parse (readPackageDescription)
import Distribution.Simple.Utils as Utils (notice, info, debug, die)
import Distribution.System
......
......@@ -28,7 +28,7 @@ module Hackage.InstallPlan (
) where
import Hackage.Types
( PkgInfo(pkgDesc), FlagAssignment )
( PkgInfo(pkgDesc) )
import Distribution.Package
( PackageIdentifier(..), Package(..), PackageFixedDeps(..) )
import Distribution.InstalledPackageInfo
......@@ -36,11 +36,11 @@ import Distribution.InstalledPackageInfo
import Distribution.PackageDescription
( GenericPackageDescription(genPackageFlags)
, PackageDescription(buildDepends)
, Flag(MkFlag, flagName) )
, Flag(MkFlag, flagName), FlagAssignment )
import Distribution.PackageDescription.Configuration
( finalizePackageDescription )
import Distribution.Simple.PackageIndex
( PackageIndex, insertPackage)
( PackageIndex )
import qualified Distribution.Simple.PackageIndex as PackageIndex
import Distribution.Simple.Utils
( comparing, equating )
......
......@@ -14,7 +14,8 @@ module Hackage.Types where
import Distribution.Package
( PackageIdentifier(..), Package(..), Dependency )
import Distribution.PackageDescription (GenericPackageDescription)
import Distribution.PackageDescription
( GenericPackageDescription, FlagAssignment )
import Distribution.Text
( display )
import Distribution.Simple.Utils (intercalate)
......@@ -76,11 +77,6 @@ repoName = remoteRepoName . repoRemote
repoURL :: Repo -> String
repoURL = remoteRepoURL . repoRemote
-- | Explicit user's assignment of configurations flags,
-- eg --flags=foo --flags=-bar
-- becomes [("foo", True), ("bar", False)]
type FlagAssignment = [(String, Bool)]
data UnresolvedDependency
= UnresolvedDependency
{ dependency :: Dependency
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment