wrath/shaniqua-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix-cabal-1.4-build

Browse Source 
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:
gbmvdd 2008-11-04 16:12:06 +00:00
parent 8038250591
commit 77722b17bc
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/System/Plugins/Env.hs
View File

@ -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

2
src/System/Plugins/PackageAPI.hs
View File

@ -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

2
src/System/Plugins/ParsePkgConfCabal.hs
View File

@ -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 )

2
src/System/Plugins/ParsePkgConfCabal.y_in
View File

@ -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 )