X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fmain%2FPackageConfig.hs;h=d5569c4a85e06697d18177b096fc1bad225a19cd;hp=80488ec05f5a331545031c1ee02c7dbf651fee86;hb=e25d5095e6fd47e0a02404d9532c2f776d3f8a32;hpb=abfbfafac4f4713d106a214be1c5237b61b7c5e2

diff --git a/compiler/main/PackageConfig.hs b/compiler/main/PackageConfig.hs
index 80488ec..d5569c4 100644
--- a/compiler/main/PackageConfig.hs
+++ b/compiler/main/PackageConfig.hs
@@ -8,7 +8,7 @@ module PackageConfig (
 	
 	-- * The PackageConfig type: information about a package
 	PackageConfig,
-	InstalledPackageInfo_(..), showPackageId,
+	InstalledPackageInfo_(..), display,
 	Version(..),
 	PackageIdentifier(..),
 	defaultPackageConfig,
@@ -16,9 +16,10 @@ module PackageConfig (
 
 #include "HsVersions.h"
 
-import Module 
+import Module
 import Distribution.InstalledPackageInfo
 import Distribution.Package
+import Distribution.Text
 import Distribution.Version
 import Distribution.Compat.ReadP ( readP_to_S )
 
@@ -45,14 +46,14 @@ defaultPackageConfig = emptyInstalledPackageInfo
 -- A PackageId is a string of the form <pkg>-<version>.
 
 mkPackageId :: PackageIdentifier -> PackageId
-mkPackageId = stringToPackageId . showPackageId
+mkPackageId = stringToPackageId . display
 
 packageConfigId :: PackageConfig -> PackageId
 packageConfigId = mkPackageId . package
 
 unpackPackageId :: PackageId -> Maybe PackageIdentifier
 unpackPackageId p
-  = case [ pid | (pid,"") <- readP_to_S parsePackageId str ] of
+  = case [ pid | (pid,"") <- readP_to_S parse str ] of
         []      -> Nothing
         (pid:_) -> Just pid
   where str = packageIdString p