Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/fc5f253fedcdee78cf8e5388ece89887da30192c >--------------------------------------------------------------- commit fc5f253fedcdee78cf8e5388ece89887da30192c Author: phigley <[email protected]> Date: Sun Feb 10 07:07:30 2008 +0000 Fixed imports to correspond to the latest arrangement of Distribution.PackageDescription. >--------------------------------------------------------------- cabal-install/Hackage/Config.hs | 2 +- cabal-install/Hackage/Dependency.hs | 5 +++-- cabal-install/Hackage/Install.hs | 2 +- cabal-install/Hackage/RepoIndex.hs | 2 +- cabal-install/Main.hs | 3 +-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cabal-install/Hackage/Config.hs b/cabal-install/Hackage/Config.hs index 0a448ca..a9c624f 100644 --- a/cabal-install/Hackage/Config.hs +++ b/cabal-install/Hackage/Config.hs @@ -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) diff --git a/cabal-install/Hackage/Dependency.hs b/cabal-install/Hackage/Dependency.hs index db725b0..b1735cc 100644 --- a/cabal-install/Hackage/Dependency.hs +++ b/cabal-install/Hackage/Dependency.hs @@ -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 diff --git a/cabal-install/Hackage/Install.hs b/cabal-install/Hackage/Install.hs index 6924ccc..82081f2 100644 --- a/cabal-install/Hackage/Install.hs +++ b/cabal-install/Hackage/Install.hs @@ -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) diff --git a/cabal-install/Hackage/RepoIndex.hs b/cabal-install/Hackage/RepoIndex.hs index 0741fec..c751f54 100644 --- a/cabal-install/Hackage/RepoIndex.hs +++ b/cabal-install/Hackage/RepoIndex.hs @@ -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(..)) diff --git a/cabal-install/Main.hs b/cabal-install/Main.hs index 5836795..b6c0c98 100644 --- a/cabal-install/Main.hs +++ b/cabal-install/Main.hs @@ -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) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
