Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/11ff0713b92ca9f510c07361ffa50e7d3afd1f6d >--------------------------------------------------------------- commit 11ff0713b92ca9f510c07361ffa50e7d3afd1f6d Author: Andres Loeh <[email protected]> Date: Thu Oct 27 19:03:04 2011 +0000 reactivate (but not use) the top-down resolver >--------------------------------------------------------------- cabal-install/Distribution/Client/Dependency.hs | 5 +++-- .../Distribution/Client/Dependency/TopDown.hs | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cabal-install/Distribution/Client/Dependency.hs b/cabal-install/Distribution/Client/Dependency.hs index 20bc1a4..9581e47 100644 --- a/cabal-install/Distribution/Client/Dependency.hs +++ b/cabal-install/Distribution/Client/Dependency.hs @@ -52,7 +52,8 @@ module Distribution.Client.Dependency ( hideInstalledPackagesAllVersions, ) where --- import Distribution.Client.Dependency.TopDown (topDownResolver) +import Distribution.Client.Dependency.TopDown + ( topDownResolver ) import Distribution.Client.Dependency.Modular ( modularResolver, SolverConfig(..) ) import qualified Distribution.Client.PackageIndex as PackageIndex @@ -305,7 +306,7 @@ standardInstallPolicy -- ------------------------------------------------------------ defaultResolver :: SolverConfig -> DependencyResolver -defaultResolver = modularResolver +defaultResolver = modularResolver -- const topDownResolver -- | Run the dependency solver. -- diff --git a/cabal-install/Distribution/Client/Dependency/TopDown.hs b/cabal-install/Distribution/Client/Dependency/TopDown.hs index 748f75c..01f2314 100644 --- a/cabal-install/Distribution/Client/Dependency/TopDown.hs +++ b/cabal-install/Distribution/Client/Dependency/TopDown.hs @@ -18,6 +18,8 @@ import Distribution.Client.Dependency.TopDown.Types import qualified Distribution.Client.Dependency.TopDown.Constraints as Constraints import Distribution.Client.Dependency.TopDown.Constraints ( Satisfiable(..) ) +import Distribution.Client.IndexUtils + ( convert ) import qualified Distribution.Client.InstallPlan as InstallPlan import Distribution.Client.InstallPlan ( PlanPackage(..) ) @@ -239,7 +241,11 @@ search configure pref constraints = -- the standard 'DependencyResolver' interface. -- topDownResolver :: DependencyResolver -topDownResolver = undefined -- ((((((mapMessages .).).).).).) . topDownResolver' +topDownResolver platform comp installedPkgIndex sourcePkgIndex + preferences constraints targets = + mapMessages (topDownResolver' platform comp + (convert installedPkgIndex) sourcePkgIndex + preferences constraints targets) where mapMessages :: Progress Log Failure a -> Progress String String a mapMessages = foldProgress (Step . showLog) (Fail . showFailure) Done _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
