Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/0602d998620a864ab2bde0eb5ae67672f38a314f >--------------------------------------------------------------- commit 0602d998620a864ab2bde0eb5ae67672f38a314f Author: Duncan Coutts <[email protected]> Date: Fri Jun 6 13:55:46 2008 +0000 Adapt to changes in Cabal library 1.4 branch >--------------------------------------------------------------- cabal-install/Hackage/Check.hs | 2 +- cabal-install/Hackage/Config.hs | 3 +-- cabal-install/Hackage/IndexUtils.hs | 5 ++++- cabal-install/Hackage/Install.hs | 4 ++-- cabal-install/Hackage/SetupWrapper.hs | 4 +--- cabal-install/Hackage/SrcDist.hs | 4 ++-- cabal-install/cabal-install.cabal | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cabal-install/Hackage/Check.hs b/cabal-install/Hackage/Check.hs index 2af71ed..c3feb86 100644 --- a/cabal-install/Hackage/Check.hs +++ b/cabal-install/Hackage/Check.hs @@ -17,7 +17,7 @@ module Hackage.Check ( import Control.Monad ( when, unless ) -import Distribution.PackageDescription.Parse ( readPackageDescription ) +import Distribution.PackageDescription ( readPackageDescription ) import Distribution.PackageDescription.Check import Distribution.PackageDescription.Configuration ( flattenPackageDescription ) import Distribution.Verbosity ( Verbosity ) diff --git a/cabal-install/Hackage/Config.hs b/cabal-install/Hackage/Config.hs index 71eb92c..58a304e 100644 --- a/cabal-install/Hackage/Config.hs +++ b/cabal-install/Hackage/Config.hs @@ -31,10 +31,9 @@ import Text.PrettyPrint.HughesPJ (text) import Distribution.Compat.ReadP (ReadP, char, munch1) import Distribution.Compiler (CompilerFlavor(..), defaultCompilerFlavor) -import Distribution.PackageDescription.Parse (ParseResult(..)) import Distribution.ParseUtils ( FieldDescr(..), simpleField, listField, liftField, field - , parseFilePathQ, parseTokenQ, showPWarning ) + , parseFilePathQ, parseTokenQ, showPWarning, ParseResult(..) ) import Distribution.Simple.Compiler (PackageDB(..)) import Distribution.Simple.InstallDirs ( InstallDirs(..), PathTemplate, toPathTemplate, fromPathTemplate ) diff --git a/cabal-install/Hackage/IndexUtils.hs b/cabal-install/Hackage/IndexUtils.hs index de178e7..1d4cbe6 100644 --- a/cabal-install/Hackage/IndexUtils.hs +++ b/cabal-install/Hackage/IndexUtils.hs @@ -24,7 +24,10 @@ import Hackage.Types import Distribution.Package (PackageIdentifier(..), Package(..), Dependency(Dependency)) import Distribution.Simple.PackageIndex (PackageIndex) import qualified Distribution.Simple.PackageIndex as PackageIndex -import Distribution.PackageDescription.Parse (parsePackageDescription, ParseResult(..)) +import Distribution.PackageDescription + ( parsePackageDescription ) +import Distribution.ParseUtils + ( ParseResult(..) ) import Distribution.Text ( simpleParse ) import Distribution.Verbosity (Verbosity) diff --git a/cabal-install/Hackage/Install.hs b/cabal-install/Hackage/Install.hs index 6c02b9a..0f031dc 100644 --- a/cabal-install/Hackage/Install.hs +++ b/cabal-install/Hackage/Install.hs @@ -59,8 +59,8 @@ import Distribution.Simple.Utils import Distribution.Package ( PackageIdentifier(..), Package(..), Dependency(..) ) import Distribution.PackageDescription as PackageDescription - ( GenericPackageDescription(packageDescription) ) -import Distribution.PackageDescription.Parse (readPackageDescription) + ( GenericPackageDescription(packageDescription) + , readPackageDescription ) import Distribution.InstalledPackageInfo ( InstalledPackageInfo ) import Distribution.Version diff --git a/cabal-install/Hackage/SetupWrapper.hs b/cabal-install/Hackage/SetupWrapper.hs index a30321a..0637732 100644 --- a/cabal-install/Hackage/SetupWrapper.hs +++ b/cabal-install/Hackage/SetupWrapper.hs @@ -28,9 +28,7 @@ import Distribution.Package ( PackageIdentifier(..), packageName, packageVersion, Dependency(..) ) import Distribution.PackageDescription ( GenericPackageDescription(packageDescription) - , PackageDescription(..), BuildType(..) ) -import Distribution.PackageDescription.Parse - ( readPackageDescription ) + , PackageDescription(..), BuildType(..), readPackageDescription ) import Distribution.InstalledPackageInfo ( InstalledPackageInfo ) import Distribution.Simple.Configure diff --git a/cabal-install/Hackage/SrcDist.hs b/cabal-install/Hackage/SrcDist.hs index 7281b4f..56f686e 100644 --- a/cabal-install/Hackage/SrcDist.hs +++ b/cabal-install/Hackage/SrcDist.hs @@ -10,14 +10,14 @@ import Hackage.Tar (createTarGzFile) import Distribution.Package ( Package(..) ) -import Distribution.PackageDescription (PackageDescription) +import Distribution.PackageDescription + ( PackageDescription, readPackageDescription ) import Distribution.Simple.Utils ( withTempDirectory , defaultPackageDesc , die, warn, notice, setupMessage ) import Distribution.Simple.Setup (SDistFlags(..), fromFlag) import Distribution.Verbosity (Verbosity) import Distribution.Simple.PreProcess (knownSuffixHandlers) -import Distribution.PackageDescription.Parse (readPackageDescription) import Distribution.Simple.BuildPaths ( srcPref) import Distribution.Simple.Configure(maybeGetPersistBuildConfig) import Distribution.PackageDescription.Configuration ( flattenPackageDescription ) diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index 4c2d856..994d717 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -63,7 +63,7 @@ Executable cabal Hackage.Upload Hackage.Utils - build-depends: Cabal >= 1.3.11 && < 1.5, filepath >= 1.0, network, + build-depends: Cabal >= 1.3.12 && < 1.5, filepath >= 1.0, network, zlib >= 0.3, HTTP >= 3000.0 && < 3001.2 if flag(old-base) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
