[commit: ghc] wip/nfs-locking: Rename readPackageDescription to readGenericPackageDescription to fix the warning (198abb4)
git at git.haskell.org
git at git.haskell.org
Fri Oct 27 01:18:04 UTC 2017
Repository : ssh://git@git.haskell.org/ghc
On branch : wip/nfs-locking
Link : http://ghc.haskell.org/trac/ghc/changeset/198abb4fff538fb67ab9262aa0a7ca5b8bd86c0f/ghc
>---------------------------------------------------------------
commit 198abb4fff538fb67ab9262aa0a7ca5b8bd86c0f
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date: Thu Mar 16 01:17:36 2017 +0000
Rename readPackageDescription to readGenericPackageDescription to fix the warning
>---------------------------------------------------------------
198abb4fff538fb67ab9262aa0a7ca5b8bd86c0f
src/Rules/Cabal.hs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Rules/Cabal.hs b/src/Rules/Cabal.hs
index 0df267f..b45af42 100644
--- a/src/Rules/Cabal.hs
+++ b/src/Rules/Cabal.hs
@@ -23,7 +23,7 @@ cabalRules = do
let pkgs = filter (\p -> p /= compiler && isLibrary p) bootPkgs
constraints <- forM (sort pkgs) $ \pkg -> do
need [pkgCabalFile pkg]
- pd <- liftIO . readPackageDescription silent $ pkgCabalFile pkg
+ pd <- liftIO . readGenericPackageDescription silent $ pkgCabalFile pkg
let identifier = package . packageDescription $ pd
version = display . pkgVersion $ identifier
return $ unPackageName (DP.pkgName identifier) ++ " == " ++ version
@@ -37,7 +37,7 @@ cabalRules = do
if not exists then return $ pkgNameString pkg
else do
need [pkgCabalFile pkg]
- pd <- liftIO . readPackageDescription silent $ pkgCabalFile pkg
+ pd <- liftIO . readGenericPackageDescription silent $ pkgCabalFile pkg
let depsLib = collectDeps $ condLibrary pd
depsExes = map (collectDeps . Just . snd) $ condExecutables pd
deps = concat $ depsLib : depsExes
More information about the ghc-commits
mailing list