Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/e46808eec35aef68dbc4c478de4baffa9604825f >--------------------------------------------------------------- commit e46808eec35aef68dbc4c478de4baffa9604825f Author: Andrea Vezzosi <[email protected]> Date: Tue Mar 18 17:44:23 2008 +0000 fix imports, because Dependency has moved in Cabal >--------------------------------------------------------------- cabal-install/Hackage/Dependency.hs | 5 ++--- cabal-install/Hackage/IndexUtils.hs | 4 ++-- cabal-install/Hackage/Info.hs | 3 +-- cabal-install/Hackage/ParseUtils.hs | 6 +++--- cabal-install/Hackage/Types.hs | 4 ++-- cabal-install/Hackage/Upgrade.hs | 4 ++-- cabal-install/Hackage/Utils.hs | 3 +-- 7 files changed, 13 insertions(+), 16 deletions(-) diff --git a/cabal-install/Hackage/Dependency.hs b/cabal-install/Hackage/Dependency.hs index da072dd..4373a40 100644 --- a/cabal-install/Hackage/Dependency.hs +++ b/cabal-install/Hackage/Dependency.hs @@ -25,15 +25,14 @@ import Distribution.InstalledPackageInfo (InstalledPackageInfo) import qualified Hackage.DepGraph as DepGraph import Hackage.Types (ResolvedDependency(..), UnresolvedDependency(..), PkgInfo(..), FlagAssignment) -import Distribution.Version (Dependency(..)) -import Distribution.Package (PackageIdentifier(..), Package(..)) +import Distribution.Package (PackageIdentifier(..), Package(..), Dependency(..)) import Distribution.PackageDescription (PackageDescription(buildDepends) , GenericPackageDescription ) import Distribution.PackageDescription.Configuration ( finalizePackageDescription) import Distribution.Simple.Compiler - ( Compiler(compilerFlavor), compilerVersion ) + ( Compiler, compilerFlavor, compilerVersion ) import Distribution.Simple.Utils (comparing) import Control.Monad (mplus) diff --git a/cabal-install/Hackage/IndexUtils.hs b/cabal-install/Hackage/IndexUtils.hs index f533ec3..e35ea45 100644 --- a/cabal-install/Hackage/IndexUtils.hs +++ b/cabal-install/Hackage/IndexUtils.hs @@ -19,8 +19,8 @@ module Hackage.IndexUtils ( import Hackage.Tar import Hackage.Types (UnresolvedDependency(..), PkgInfo(..), Repo(..)) -import Distribution.Package (PackageIdentifier(..), Package(..)) -import Distribution.Version (Dependency(Dependency), readVersion) +import Distribution.Package (PackageIdentifier(..), Package(..), Dependency(Dependency)) +import Distribution.Version (readVersion) import Distribution.Simple.PackageIndex (PackageIndex) import qualified Distribution.Simple.PackageIndex as PackageIndex import Distribution.PackageDescription.Parse (parsePackageDescription, ParseResult(..)) diff --git a/cabal-install/Hackage/Info.hs b/cabal-install/Hackage/Info.hs index 57772b9..41d4b66 100644 --- a/cabal-install/Hackage/Info.hs +++ b/cabal-install/Hackage/Info.hs @@ -19,8 +19,7 @@ import Hackage.Fetch import Hackage.Types import Hackage.Utils (showDependencies) -import Distribution.Package (showPackageId, Package(..)) -import Distribution.ParseUtils (showDependency) +import Distribution.Package (showPackageId, Package(..), showDependency) import Data.List (nubBy) diff --git a/cabal-install/Hackage/ParseUtils.hs b/cabal-install/Hackage/ParseUtils.hs index d518488..4169240 100644 --- a/cabal-install/Hackage/ParseUtils.hs +++ b/cabal-install/Hackage/ParseUtils.hs @@ -1,12 +1,12 @@ module Hackage.ParseUtils where import Distribution.Compat.ReadP (ReadP, readP_to_S, pfail, get, look, choice, (+++)) -import Distribution.Package (PackageIdentifier(..), parsePackageId) +import Distribution.Package (PackageIdentifier(..), parsePackageId, Dependency(..), parseDependency) import Distribution.ParseUtils (Field(..), FieldDescr(..), ParseResult(..), PError - , field, liftField, readFields, parseDependency + , field, liftField, readFields , warning, lineNo, locatedErrorMsg) -import Distribution.Version (Version(..), Dependency(..), VersionRange(..)) +import Distribution.Version (Version(..), VersionRange(..)) import Control.Monad (foldM, liftM) import Data.Char (isSpace, toLower) diff --git a/cabal-install/Hackage/Types.hs b/cabal-install/Hackage/Types.hs index 2cb9e1e..4b3a9c5 100644 --- a/cabal-install/Hackage/Types.hs +++ b/cabal-install/Hackage/Types.hs @@ -12,9 +12,9 @@ ----------------------------------------------------------------------------- module Hackage.Types where -import Distribution.Package (PackageIdentifier(..), showPackageId, Package(..)) +import Distribution.Package (PackageIdentifier(..), showPackageId, Package(..), Dependency) import Distribution.PackageDescription (GenericPackageDescription) -import Distribution.Version (Dependency, showVersion) +import Distribution.Version (showVersion) import Distribution.Simple.Utils (intercalate) import System.FilePath ((</>), (<.>)) diff --git a/cabal-install/Hackage/Upgrade.hs b/cabal-install/Hackage/Upgrade.hs index 99e981a..dea5d60 100644 --- a/cabal-install/Hackage/Upgrade.hs +++ b/cabal-install/Hackage/Upgrade.hs @@ -25,8 +25,8 @@ import Hackage.Setup (InstallFlags(..)) import Distribution.Simple.Program (ProgramConfiguration) import Distribution.Simple.Compiler (Compiler, PackageDB) import Distribution.Simple.Configure (getInstalledPackages) -import Distribution.Package (PackageIdentifier(..), Package(..)) -import Distribution.Version (VersionRange(..), Dependency(..)) +import Distribution.Package (PackageIdentifier(..), Package(..), Dependency(..)) +import Distribution.Version (VersionRange(..)) import Distribution.Verbosity (Verbosity) import qualified Distribution.Simple.Setup as Cabal diff --git a/cabal-install/Hackage/Utils.hs b/cabal-install/Hackage/Utils.hs index 5974151..bca2b1d 100644 --- a/cabal-install/Hackage/Utils.hs +++ b/cabal-install/Hackage/Utils.hs @@ -1,7 +1,6 @@ module Hackage.Utils where -import Distribution.ParseUtils (showDependency) -import Distribution.Version (Dependency(..)) +import Distribution.Package (Dependency(..), showDependency) import Distribution.Simple.Utils (intercalate) import Control.Monad (guard) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
