Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/5f178967c013c66839a18bc6205091afbbb671e0 >--------------------------------------------------------------- commit 5f178967c013c66839a18bc6205091afbbb671e0 Author: Duncan Coutts <[email protected]> Date: Sat Oct 16 19:28:16 2010 +0000 Update to use Cabal-1.10.x >--------------------------------------------------------------- cabal-install/Distribution/Client/SetupWrapper.hs | 7 ++++--- cabal-install/cabal-install.cabal | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cabal-install/Distribution/Client/SetupWrapper.hs b/cabal-install/Distribution/Client/SetupWrapper.hs index 4330f78..9315339 100644 --- a/cabal-install/Distribution/Client/SetupWrapper.hs +++ b/cabal-install/Distribution/Client/SetupWrapper.hs @@ -26,14 +26,15 @@ import Distribution.Client.Types import qualified Distribution.Make as Make import qualified Distribution.Simple as Simple import Distribution.Version - ( Version(..), VersionRange, anyVersion, intersectVersionRanges + ( Version(..), VersionRange, anyVersion + , intersectVersionRanges, orLaterVersion , withinRange ) import Distribution.Package ( PackageIdentifier(..), PackageName(..), Package(..), packageName , packageVersion, Dependency(..) ) import Distribution.PackageDescription ( GenericPackageDescription(packageDescription) - , PackageDescription(..), BuildType(..) ) + , PackageDescription(..), specVersion, BuildType(..) ) import Distribution.PackageDescription.Parse ( readPackageDescription ) import Distribution.Simple.Configure @@ -109,7 +110,7 @@ setupWrapper verbosity options mpkg cmd flags extraArgs = do options' = options { useCabalVersion = intersectVersionRanges (useCabalVersion options) - (descCabalVersion pkg) + (orLaterVersion (specVersion pkg)) } buildType' = fromMaybe Custom (buildType pkg) mkArgs cabalLibVersion = commandName cmd diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index aa17432..e085378 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -1,5 +1,5 @@ Name: cabal-install -Version: 0.9.2 +Version: 0.9.5 Synopsis: The command-line interface for Cabal and Hackage. Description: The \'cabal\' command-line program simplifies the process of managing @@ -84,7 +84,7 @@ Executable cabal Paths_cabal_install build-depends: base >= 2 && < 5, - Cabal >= 1.9 && < 1.10, + Cabal >= 1.10 && < 1.11, filepath >= 1.0, network >= 1 && < 3, HTTP >= 4000.0.2 && < 4001, _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
