Follow changes in Cabal

compiler/ghci/Linker.lhs

@@ -75,7 +75,7 @@ import System.FilePath
 import System.IO
 import System.Directory
 
-import Distribution.Package hiding (depends)
+import Distribution.Package hiding (depends, PackageId)
 
 import Exception
 import Data.Maybe

compiler/main/Finder.lhs

@@ -37,7 +37,7 @@ import FiniteMap
 import LazyUniqFM
 import Maybes		( expectJust )
 
-import Distribution.Package
+import Distribution.Package hiding (PackageId)
 import Data.IORef	( IORef, writeIORef, readIORef, modifyIORef )
 import Data.List
 import System.Directory

compiler/main/PackageConfig.hs

@@ -25,7 +25,7 @@ import Data.Maybe
 import Module
 import Distribution.InstalledPackageInfo
 import Distribution.ModuleName
-import Distribution.Package
+import Distribution.Package hiding (PackageId)
 import Distribution.Text
 import Distribution.Version
 import Distribution.Compat.ReadP

compiler/main/Packages.lhs

@@ -49,7 +49,7 @@ import Outputable
 
 import System.Environment ( getEnv )
 import Distribution.InstalledPackageInfo hiding (depends)
-import Distribution.Package hiding (depends)
+import Distribution.Package hiding (depends, PackageId)
 import Distribution.Text
 import Distribution.Version
 import FastString