Update Cabal submodule to 1.22 version
authorHerbert Valerio Riedel <hvr@gnu.org>
Thu, 18 Dec 2014 22:15:03 +0000 (23:15 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Thu, 18 Dec 2014 22:15:03 +0000 (23:15 +0100)
libraries/Cabal
testsuite/tests/driver/T4437.hs
utils/ghc-cabal/Main.hs
utils/ghc-cabal/ghc-cabal.cabal
utils/ghctags/ghctags.cabal

index 1d1ecd6..82d2fe1 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 1d1ecd611560dd719642a9ef3e536caf0df1dc8c
+Subproject commit 82d2fe1f5083e56f0b2d2c2409a3f673a56a5fe4
index 250eae1..72f5f58 100644 (file)
@@ -34,7 +34,6 @@ expectedGhcOnlyExtensions = ["RelaxedLayout",
                              "AlternativeLayoutRule",
                              "AlternativeLayoutRuleTransitional",
                              "DeriveAnyClass",
-                             "JavaScriptFFI",
                              "PatternSynonyms",
                              "PartialTypeSignatures",
                              "NamedWildcards",
index 8729fd4..6724f3a 100644 (file)
@@ -10,6 +10,7 @@ import Distribution.System
 import Distribution.Simple
 import Distribution.Simple.Configure
 import Distribution.Simple.LocalBuildInfo
+import Distribution.Simple.GHC
 import Distribution.Simple.Program
 import Distribution.Simple.Program.HcPkg
 import Distribution.Simple.Setup (ConfigFlags(configStripLibs), fromFlag, toFlag)
@@ -224,8 +225,7 @@ doRegister directory distDir ghc ghcpkg topdir
                 configurePrograms ps conf = foldM (flip (configureProgram verbosity)) conf ps
 
             progs' <- configurePrograms [ghcProgram', ghcPkgProgram'] progs
-            let Just ghcPkgProg = lookupProgram ghcPkgProgram' progs'
-            instInfos <- dump verbosity ghcPkgProg GlobalPackageDB
+            instInfos <- dump (hcPkgInfo progs') verbosity GlobalPackageDB
             let installedPkgs' = PackageIndex.fromList instInfos
             let updateComponentConfig (cn, clbi, deps)
                     = (cn, updateComponentLocalBuildInfo clbi, deps)
index 2641f19..f963c7c 100644 (file)
@@ -17,7 +17,7 @@ Executable ghc-cabal
 
     Build-Depends: base       >= 3   && < 5,
                    bytestring >= 0.10 && < 0.11,
-                   Cabal      >= 1.20 && < 1.22,
+                   Cabal      >= 1.22 && < 1.24,
                    directory  >= 1.1 && < 1.3,
                    filepath   >= 1.2 && < 1.4
 
index cfa841d..7901aa2 100644 (file)
@@ -18,6 +18,6 @@ Executable ghctags
 
     Build-Depends: base       >= 4   && < 5,
                    containers,
-                   Cabal      >= 1.20 && <1.22,
+                   Cabal      >= 1.22 && <1.24,
                    ghc