Commit fc5f253f authored by phigley's avatar phigley
Browse files

Fixed imports to correspond to the latest arrangement of Distribution.PackageDescription.

parent 9651fc96
......@@ -31,7 +31,7 @@ import Text.PrettyPrint.HughesPJ (text)
import Distribution.Compat.ReadP (ReadP, char, munch1, readS_to_P)
import Distribution.Compiler (CompilerFlavor(..), defaultCompilerFlavor)
import Distribution.PackageDescription (ParseResult(..))
import Distribution.PackageDescription.Parse (ParseResult(..))
import Distribution.ParseUtils (FieldDescr(..), simpleField, listField, liftField, field)
import Distribution.Simple.Compiler (PackageDB(..))
import Distribution.Simple.InstallDirs (InstallDirs(..), PathTemplate, toPathTemplate)
......
......@@ -29,8 +29,9 @@ import Distribution.Version (Dependency(..))
import Distribution.Package (PackageIdentifier(..))
import Distribution.PackageDescription
(PackageDescription(buildDepends)
, GenericPackageDescription
, finalizePackageDescription)
, GenericPackageDescription )
import Distribution.PackageDescription.Configuration
( finalizePackageDescription)
import Distribution.Simple.Compiler (Compiler, showCompilerId, compilerVersion)
import qualified Distribution.Simple.Setup as Cabal
......
......@@ -39,7 +39,7 @@ import Distribution.Simple.SetupWrapper (setupWrapper)
import qualified Distribution.Simple.Setup as Cabal
import Distribution.Simple.Utils (defaultPackageDesc)
import Distribution.Package (showPackageId, PackageIdentifier(..))
import Distribution.PackageDescription (readPackageDescription)
import Distribution.PackageDescription.Parse (readPackageDescription)
import Distribution.Simple.Utils as Utils (notice, info, debug, die)
import Distribution.Verbosity (Verbosity)
......
......@@ -48,7 +48,7 @@ import Data.ByteString.Lazy (ByteString)
import System.FilePath ((</>), takeExtension, splitDirectories, normalise)
import System.IO.Error (isDoesNotExistError)
import Distribution.PackageDescription (parsePackageDescription, ParseResult(..))
import Distribution.PackageDescription.Parse (parsePackageDescription, ParseResult(..))
-- PackageDescription(package),
-- GenericPackageDescription(packageDescription))
import Distribution.Package (PackageIdentifier(..))
......
......@@ -14,7 +14,6 @@
module Main where
import Hackage.Setup
import Distribution.PackageDescription (cabalVersion)
import Distribution.Simple.Setup (Flag, fromFlag, fromFlagOrDefault,
flagToMaybe)
import qualified Distribution.Simple.Setup as Cabal
......@@ -22,7 +21,7 @@ import Distribution.Simple.Program (defaultProgramConfiguration)
import Distribution.Simple.Command
import Distribution.Simple.SetupWrapper (setupWrapper)
import Distribution.Simple.Configure (configCompilerAux)
import Distribution.Simple.Utils (die)
import Distribution.Simple.Utils (cabalVersion, die)
import Hackage.Config (SavedConfig(..), savedConfigToConfigFlags,
defaultConfigFile, loadConfig, configRepos,
configPackageDB)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment