Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/fcafa4b9df01e126b7f71c52b7e00d1b28aba33f >--------------------------------------------------------------- commit fcafa4b9df01e126b7f71c52b7e00d1b28aba33f Author: Duncan Coutts <[email protected]> Date: Sun Apr 20 19:15:43 2008 +0000 Update for FlagAssignment changes >--------------------------------------------------------------- cabal-install/Hackage/DepGraph.hs | 2 ++ cabal-install/Hackage/Dependency.hs | 8 ++++---- cabal-install/Hackage/Install.hs | 7 ++++--- cabal-install/Hackage/InstallPlan.hs | 6 +++--- cabal-install/Hackage/Types.hs | 8 ++------ 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/cabal-install/Hackage/DepGraph.hs b/cabal-install/Hackage/DepGraph.hs index af38498..9c8a6e3 100644 --- a/cabal-install/Hackage/DepGraph.hs +++ b/cabal-install/Hackage/DepGraph.hs @@ -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 diff --git a/cabal-install/Hackage/Dependency.hs b/cabal-install/Hackage/Dependency.hs index 311575d..afcedc4 100644 --- a/cabal-install/Hackage/Dependency.hs +++ b/cabal-install/Hackage/Dependency.hs @@ -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 diff --git a/cabal-install/Hackage/Install.hs b/cabal-install/Hackage/Install.hs index 32c2a17..9afb643 100644 --- a/cabal-install/Hackage/Install.hs +++ b/cabal-install/Hackage/Install.hs @@ -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 diff --git a/cabal-install/Hackage/InstallPlan.hs b/cabal-install/Hackage/InstallPlan.hs index 61aa0a7..1f5bb16 100644 --- a/cabal-install/Hackage/InstallPlan.hs +++ b/cabal-install/Hackage/InstallPlan.hs @@ -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 ) diff --git a/cabal-install/Hackage/Types.hs b/cabal-install/Hackage/Types.hs index d58aea3..d56b362 100644 --- a/cabal-install/Hackage/Types.hs +++ b/cabal-install/Hackage/Types.hs @@ -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 _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
