[commit: Cabal] master: Update for renamed PackageIndex.delete (now .deletePackageId) (df0ab6e)
Ian Lynagh
igloo at earth.li
Fri Jun 24 01:54:07 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/df0ab6e84af8008c65f5d018b13e93d1163f56cb
>---------------------------------------------------------------
commit df0ab6e84af8008c65f5d018b13e93d1163f56cb
Author: Duncan Coutts <duncan at haskell.org>
Date: Fri May 16 00:29:00 2008 +0000
Update for renamed PackageIndex.delete (now .deletePackageId)
>---------------------------------------------------------------
cabal-install/Hackage/Dependency.hs | 2 +-
cabal-install/Hackage/Install.hs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cabal-install/Hackage/Dependency.hs b/cabal-install/Hackage/Dependency.hs
index ae40503..440818a 100644
--- a/cabal-install/Hackage/Dependency.hs
+++ b/cabal-install/Hackage/Dependency.hs
@@ -59,7 +59,7 @@ resolveDependencies os arch comp Nothing available deps =
hideBrokenPackages :: PackageFixedDeps p => PackageIndex p -> PackageIndex p
hideBrokenPackages index =
check (null . PackageIndex.brokenPackages)
- . foldr (PackageIndex.delete . packageId) index
+ . foldr (PackageIndex.deletePackageId . packageId) index
. PackageIndex.reverseDependencyClosure index
. map (packageId . fst)
$ PackageIndex.brokenPackages index
diff --git a/cabal-install/Hackage/Install.hs b/cabal-install/Hackage/Install.hs
index 0f4f538..4ddcb91 100644
--- a/cabal-install/Hackage/Install.hs
+++ b/cabal-install/Hackage/Install.hs
@@ -182,7 +182,7 @@ planLocalPackage verbosity comp configFlags installed available = do
-- dependency on exactly that package. So the resolver ends up having
-- to pick the local package.
available' = PackageIndex.insert localPkg available
- installed' = PackageIndex.delete (packageId localPkg) `fmap` installed
+ installed' = PackageIndex.deletePackageId (packageId localPkg) `fmap` installed
localPkg = AvailablePackage {
packageInfoId = packageId pkg,
Available.packageDescription = pkg,
More information about the Cvs-libraries
mailing list