From c735a21acf3e478df36f630cf224dcb3755db485 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 13 Aug 2008 21:58:44 +0000 Subject: [PATCH] Follow changes in Cabal --- compiler/ghci/Linker.lhs | 2 +- compiler/main/Finder.lhs | 2 +- compiler/main/PackageConfig.hs | 2 +- compiler/main/Packages.lhs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs index 9fd39ef..459fbd9 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 bbea77d..4c6ae29 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 4db59ad..239a917 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 ace175d..41ca465 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 -- 1.7.10.4