[commit: ghc] wip/nfs-locking: Fix breakage due to changes in Cabal API (e908a4a)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:49:05 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/e908a4a28964908ee30346a04aae23a4d314e8b2/ghc

>---------------------------------------------------------------

commit e908a4a28964908ee30346a04aae23a4d314e8b2
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Wed Jan 25 17:45:48 2017 +0000

    Fix breakage due to changes in Cabal API


>---------------------------------------------------------------

e908a4a28964908ee30346a04aae23a4d314e8b2
 src/Rules/Cabal.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Rules/Cabal.hs b/src/Rules/Cabal.hs
index 6adaf44..0df267f 100644
--- a/src/Rules/Cabal.hs
+++ b/src/Rules/Cabal.hs
@@ -4,6 +4,7 @@ import Distribution.Package as DP
 import Distribution.PackageDescription
 import Distribution.PackageDescription.Parse
 import Distribution.Text
+import Distribution.Types.CondTree
 import Distribution.Types.Dependency
 import Distribution.Verbosity
 
@@ -49,4 +50,4 @@ collectDeps :: Maybe (CondTree v [Dependency] a) -> [Dependency]
 collectDeps Nothing = []
 collectDeps (Just (CondNode _ deps ifs)) = deps ++ concatMap f ifs
   where
-    f (_, t, mt) = collectDeps (Just t) ++ collectDeps mt
+    f (CondBranch _ t mt) = collectDeps (Just t) ++ collectDeps mt



More information about the ghc-commits mailing list