Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/2ec493434b12981761b9240e91f85fef8c9166e0 >--------------------------------------------------------------- commit 2ec493434b12981761b9240e91f85fef8c9166e0 Author: Duncan Coutts <[email protected]> Date: Wed May 21 15:37:00 2008 +0000 Hide any available base and ghc-prim packages from the dep resolver Previously if the base package was available on hackage then the dep resolver might try to upgrade it. Unfortunately that's almost certainly technically impossible at the moment. So now since the dep resolver does not see these available packages it cannot pick them. This should fix ticket #174. >--------------------------------------------------------------- cabal-install/Hackage/Dependency.hs | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/cabal-install/Hackage/Dependency.hs b/cabal-install/Hackage/Dependency.hs index 1228bce..91ef270 100644 --- a/cabal-install/Hackage/Dependency.hs +++ b/cabal-install/Hackage/Dependency.hs @@ -66,6 +66,10 @@ hideBrokenPackages index = where check p x = assert (p x) x +hideBasePackage :: Package p => PackageIndex p -> PackageIndex p +hideBasePackage = PackageIndex.deletePackageName "base" + . PackageIndex.deletePackageName "ghc-prim" + type DependencyResolver a = OS -> Arch -> CompilerId @@ -82,7 +86,9 @@ dependencyResolver -> [UnresolvedDependency] -> Either [Dependency] (InstallPlan a) dependencyResolver resolver os arch comp installed available deps = - case resolver os arch comp (hideBrokenPackages installed) available deps of + let installed' = hideBrokenPackages installed + available' = hideBasePackage available + in case resolver os arch comp installed' available' deps of Left unresolved -> Left unresolved Right pkgs -> case InstallPlan.new os arch comp (PackageIndex.fromList pkgs) of _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
