Adapt to changes in Cabal library 1.4 branch

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 )

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 )

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)

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

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

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 )

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)