Commit 895a291d authored by Edward Z. Yang's avatar Edward Z. Yang Committed by Erik de Castro Lopo

Re-export Dependency from Distribution.Package.

Fixes #4404.
Signed-off-by: default avatarEdward Z. Yang <ezyang@cs.stanford.edu>
parent 00f0ad4b
......@@ -14,7 +14,6 @@ import Distribution.PackageDescription as PD hiding (Flag)
import Distribution.Simple.BuildToolDepends
import Distribution.Simple.LocalBuildInfo
import Distribution.Types.ComponentRequestedSpec
import Distribution.Types.Dependency
import Distribution.Types.UnqualComponentName
import Distribution.Compat.Graph (Node(..))
import qualified Distribution.Compat.Graph as Graph
......
......@@ -24,6 +24,7 @@ module Distribution.Package
, module Distribution.Types.Module
, module Distribution.Types.PackageName
, module Distribution.Types.PkgconfigName
, module Distribution.Types.Dependency
, Package(..), packageName, packageVersion
, HasMungedPackageId(..), mungedName', mungedVersion'
, HasUnitId(..)
......@@ -39,6 +40,7 @@ import Distribution.Version
import Distribution.Types.AbiHash
import Distribution.Types.ComponentId
import Distribution.Types.Dependency
import Distribution.Types.MungedPackageId
import Distribution.Types.PackageId
import Distribution.Types.UnitId
......
......@@ -80,7 +80,6 @@ import Distribution.Simple.Program
import Distribution.Simple.Setup as Setup
import Distribution.Simple.BuildTarget
import Distribution.Simple.LocalBuildInfo
import Distribution.Types.Dependency
import Distribution.Types.ExeDependency
import Distribution.Types.LegacyExeDependency
import Distribution.Types.PkgconfigDependency
......
......@@ -109,7 +109,6 @@ import Distribution.ModuleName
import qualified Distribution.InstalledPackageInfo as IPI
import Distribution.Version
import Distribution.Simple.Utils
import Distribution.Types.Dependency
import Distribution.Types.UnqualComponentName
import Control.Exception (assert)
......
......@@ -57,7 +57,6 @@ import Distribution.ModuleName
import Distribution.InstalledPackageInfo
( InstalledPackageInfo, exposed )
import qualified Distribution.Package as P
import qualified Distribution.Types.Dependency as P
import Language.Haskell.Extension ( Language(..) )
import Distribution.Client.Init.Types
......
......@@ -32,7 +32,6 @@ import Distribution.Client.Config
import Distribution.Solver.Types.ConstraintSource
import Distribution.Package
import Distribution.Types.Dependency
import Distribution.PackageDescription
( SourceRepo(..), RepoKind(..)
, dispFlagAssignment, parseFlagAssignment )
......
......@@ -103,7 +103,6 @@ import Distribution.Package hiding
(InstalledPackageId, installedPackageId)
import Distribution.Types.AnnotatedId
import Distribution.Types.ComponentName
import Distribution.Types.Dependency
import Distribution.Types.PkgconfigDependency
import Distribution.Types.UnqualComponentName
import Distribution.System
......
......@@ -13,7 +13,6 @@ import Distribution.Compiler
import Distribution.InstalledPackageInfo as IPI
import Distribution.Package -- from Cabal
import Distribution.Simple.BuildToolDepends -- from Cabal
import Distribution.Types.Dependency -- from Cabal
import Distribution.Types.ExeDependency -- from Cabal
import Distribution.Types.PkgconfigDependency -- from Cabal
import Distribution.Types.ComponentName -- from Cabal
......
......@@ -12,7 +12,6 @@ import qualified Data.Map as Map
import Data.List
import Distribution.Package
import Distribution.Types.Dependency
import Distribution.PackageDescription hiding (Flag)
import Distribution.Compiler
import Distribution.Version
......
......@@ -51,7 +51,6 @@ import Distribution.License (License(..))
import qualified Distribution.ModuleName as Module
import qualified Distribution.Package as C
hiding (HasUnitId(..))
import qualified Distribution.Types.Dependency as C
import qualified Distribution.Types.LegacyExeDependency as C
import qualified Distribution.Types.PkgconfigDependency as C
import qualified Distribution.Types.UnqualComponentName as C
......
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