Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/825e9cba53ea2210596d51ed0cf0450f2e58a32c >--------------------------------------------------------------- commit 825e9cba53ea2210596d51ed0cf0450f2e58a32c Author: Duncan Coutts <[email protected]> Date: Thu May 29 20:47:14 2008 +0000 Use thisPackageVersion and notThisPackageVersion from Distribution.Package rather than the local definitions >--------------------------------------------------------------- cabal-install/Hackage/Dependency/TopDown.hs | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/cabal-install/Hackage/Dependency/TopDown.hs b/cabal-install/Hackage/Dependency/TopDown.hs index 7597673..9d7335f 100644 --- a/cabal-install/Hackage/Dependency/TopDown.hs +++ b/cabal-install/Hackage/Dependency/TopDown.hs @@ -31,14 +31,12 @@ import qualified Distribution.Simple.PackageIndex as PackageIndex import Distribution.Simple.PackageIndex (PackageIndex) import Distribution.InstalledPackageInfo (InstalledPackageInfo) import Distribution.Package - ( PackageIdentifier(PackageIdentifier), Dependency(Dependency) - , Package(..), packageVersion ) + ( PackageIdentifier, Package(packageId), packageVersion + , Dependency(Dependency), thisPackageVersion, notThisPackageVersion ) import Distribution.PackageDescription ( PackageDescription(buildDepends) ) import Distribution.PackageDescription.Configuration ( finalizePackageDescription) -import Distribution.Version - ( VersionRange(..) ) import Distribution.Compiler ( CompilerId ) import Distribution.System @@ -257,9 +255,6 @@ addPackageSelectConstraint pkgid constraints = dep = TaggedDependency NoInstalledConstraint (thisPackageVersion pkgid) reason = SelectedOther pkgid -thisPackageVersion :: PackageIdentifier -> Dependency -thisPackageVersion (PackageIdentifier n v) = Dependency n (ThisVersion v) - addPackageExcludeConstraint :: PackageIdentifier -> Constraints -> Satisfiable Constraints ExclusionReason addPackageExcludeConstraint pkgid constraints = @@ -268,9 +263,6 @@ addPackageExcludeConstraint pkgid constraints = dep = TaggedDependency NoInstalledConstraint (notThisPackageVersion pkgid) reason = ExcludedByConfigureFail - notThisPackageVersion (PackageIdentifier n v) = - Dependency n (notThisVersion v) - notThisVersion v = UnionVersionRanges (EarlierVersion v) (LaterVersion v) addPackageDependencyConstraint :: PackageIdentifier -> TaggedDependency -> Constraints -> Satisfiable Constraints ExclusionReason _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
