diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs index 9fd39ef2424378dba6630aaf04eeb57f784a4127..459fbd9e908c48431b468241805f70b7869ace8a 100644 --- a/compiler/ghci/Linker.lhs +++ b/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 diff --git a/compiler/main/Finder.lhs b/compiler/main/Finder.lhs index bbea77d44a222881df3ddafdc223491f79803551..4c6ae292985e7350d8a98446e3cf610367565406 100644 --- a/compiler/main/Finder.lhs +++ b/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 diff --git a/compiler/main/PackageConfig.hs b/compiler/main/PackageConfig.hs index 4db59addfe6fc3b7a19d9fe5d3d7a9e59638a59e..239a917560bdc4f17406545a09ceffca6192a819 100644 --- a/compiler/main/PackageConfig.hs +++ b/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 diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index ace175db999cbe9de33008d10fc5798da1db493a..41ca4653aee40434f6f27ac01c68301c0b358e2b 100644 --- a/compiler/main/Packages.lhs +++ b/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