fix-cabal-1.4-build
Hide conflicting imports of Distribution.Package.depends and packageName where necessary to allow hs-plugins to build against Cabal>=1.4.
This commit is contained in:
parent
8038250591
commit
77722b17bc
@ -74,7 +74,7 @@ import System.IO.Error ( catch, ioError, isDoesNotExistError )
|
|||||||
|
|
||||||
import Control.Concurrent.MVar ( MVar(), newMVar, withMVar )
|
import Control.Concurrent.MVar ( MVar(), newMVar, withMVar )
|
||||||
|
|
||||||
import Distribution.Package
|
import Distribution.Package hiding (packageName)
|
||||||
import Text.ParserCombinators.ReadP
|
import Text.ParserCombinators.ReadP
|
||||||
|
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
|
@ -40,7 +40,7 @@ module System.Plugins.PackageAPI (
|
|||||||
|
|
||||||
#if CABAL == 1 || __GLASGOW_HASKELL__ >= 604
|
#if CABAL == 1 || __GLASGOW_HASKELL__ >= 604
|
||||||
import Distribution.InstalledPackageInfo
|
import Distribution.InstalledPackageInfo
|
||||||
import Distribution.Package
|
import Distribution.Package hiding (depends, packageName)
|
||||||
#else
|
#else
|
||||||
import System.Plugins.Package
|
import System.Plugins.Package
|
||||||
#endif
|
#endif
|
||||||
|
@ -6,7 +6,7 @@ module System.Plugins.ParsePkgConfCabal (
|
|||||||
) where
|
) where
|
||||||
|
|
||||||
import Distribution.InstalledPackageInfo
|
import Distribution.InstalledPackageInfo
|
||||||
import Distribution.Package
|
import Distribution.Package hiding (depends)
|
||||||
import Distribution.Version
|
import Distribution.Version
|
||||||
|
|
||||||
import Data.Char ( isSpace, isAlpha, isAlphaNum, isUpper, isDigit )
|
import Data.Char ( isSpace, isAlpha, isAlphaNum, isUpper, isDigit )
|
||||||
|
@ -36,7 +36,7 @@ module System.Plugins.ParsePkgConfCabal (
|
|||||||
) where
|
) where
|
||||||
|
|
||||||
import Distribution.InstalledPackageInfo
|
import Distribution.InstalledPackageInfo
|
||||||
import Distribution.Package
|
import Distribution.Package hiding (depends)
|
||||||
import Distribution.Version
|
import Distribution.Version
|
||||||
|
|
||||||
import Data.Char ( isSpace, isAlpha, isAlphaNum, isUpper, isDigit )
|
import Data.Char ( isSpace, isAlpha, isAlphaNum, isUpper, isDigit )
|
||||||
|
Loading…
x
Reference in New Issue
Block a user