[Haskell-cafe] hs-plugins compile error

[Edsko de Vries]

Hi,

I'm getting the compilation error that is actually logged on Hackage:

http://hackage.haskell.org/cgi-bin/hackage-scripts/package/plugins

Below is a small diff file that resolves these problems; I don't know
what the proper protocol is for submitting these diffs but it may be
useful to someone.

- E 

diff -ur plugins-1.2-orig/src/System/Plugins/Env.hs plugins-1.2/src/System/Plugins/Env.hs
--- plugins-1.2-orig/src/System/Plugins/Env.hs	2008-06-02 14:57:59.000000000 +0100
+++ plugins-1.2/src/System/Plugins/Env.hs	2008-06-02 15:00:25.000000000 +0100
@@ -73,7 +73,7 @@
 
 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 -ur plugins-1.2-orig/src/System/Plugins/PackageAPI.hs plugins-1.2/src/System/Plugins/PackageAPI.hs
--- plugins-1.2-orig/src/System/Plugins/PackageAPI.hs	2008-06-02 14:57:59.000000000 +0100
+++ plugins-1.2/src/System/Plugins/PackageAPI.hs	2008-06-02 14:59:49.000000000 +0100
@@ -40,7 +40,7 @@
 
 #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 -ur plugins-1.2-orig/src/System/Plugins/ParsePkgConfCabal.hs plugins-1.2/src/System/Plugins/ParsePkgConfCabal.hs
--- plugins-1.2-orig/src/System/Plugins/ParsePkgConfCabal.hs	2008-06-02 14:57:59.000000000 +0100
+++ plugins-1.2/src/System/Plugins/ParsePkgConfCabal.hs	2008-06-02 14:58:56.000000000 +0100
@@ -6,7 +6,7 @@
   ) where
 
 import Distribution.InstalledPackageInfo
-import Distribution.Package
+import Distribution.Package hiding (depends)
 import Distribution.Version
 
 import Data.Char             ( isSpace, isAlpha, isAlphaNum, isUpper, isDigit )