From 77722b17bce3d3fcbbc9c817e991b8578a778a67 Mon Sep 17 00:00:00 2001 From: gbmvdd Date: Tue, 4 Nov 2008 16:12:06 +0000 Subject: [PATCH] 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. --- src/System/Plugins/Env.hs | 2 +- src/System/Plugins/PackageAPI.hs | 2 +- src/System/Plugins/ParsePkgConfCabal.hs | 2 +- src/System/Plugins/ParsePkgConfCabal.y_in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/System/Plugins/Env.hs b/src/System/Plugins/Env.hs index 2412751..cfd6434 100644 --- a/src/System/Plugins/Env.hs +++ b/src/System/Plugins/Env.hs @@ -74,7 +74,7 @@ import System.IO.Error ( catch, ioError, isDoesNotExistError ) import Control.Concurrent.MVar ( MVar(), newMVar, withMVar ) -import Distribution.Package +import Distribution.Package hiding (packageName) import Text.ParserCombinators.ReadP import qualified Data.Map as M diff --git a/src/System/Plugins/PackageAPI.hs b/src/System/Plugins/PackageAPI.hs index 7ac4201..6d4df5c 100644 --- a/src/System/Plugins/PackageAPI.hs +++ b/src/System/Plugins/PackageAPI.hs @@ -40,7 +40,7 @@ module System.Plugins.PackageAPI ( #if CABAL == 1 || __GLASGOW_HASKELL__ >= 604 import Distribution.InstalledPackageInfo -import Distribution.Package +import Distribution.Package hiding (depends, packageName) #else import System.Plugins.Package #endif diff --git a/src/System/Plugins/ParsePkgConfCabal.hs b/src/System/Plugins/ParsePkgConfCabal.hs index eba427e..d1065ff 100644 --- a/src/System/Plugins/ParsePkgConfCabal.hs +++ b/src/System/Plugins/ParsePkgConfCabal.hs @@ -6,7 +6,7 @@ module System.Plugins.ParsePkgConfCabal ( ) where import Distribution.InstalledPackageInfo -import Distribution.Package +import Distribution.Package hiding (depends) import Distribution.Version import Data.Char ( isSpace, isAlpha, isAlphaNum, isUpper, isDigit ) diff --git a/src/System/Plugins/ParsePkgConfCabal.y_in b/src/System/Plugins/ParsePkgConfCabal.y_in index ddd4516..9e1e2a1 100644 --- a/src/System/Plugins/ParsePkgConfCabal.y_in +++ b/src/System/Plugins/ParsePkgConfCabal.y_in @@ -36,7 +36,7 @@ module System.Plugins.ParsePkgConfCabal ( ) where import Distribution.InstalledPackageInfo -import Distribution.Package +import Distribution.Package hiding (depends) import Distribution.Version import Data.Char ( isSpace, isAlpha, isAlphaNum, isUpper, isDigit )