diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-12-18 23:15:03 +0100 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-12-18 23:15:03 +0100 |
| commit | 4c02b6f5dc4385369aa62160acd6037a32922f84 (patch) | |
| tree | 32e459480b17e772d25061b12efe4a3a7e206e13 | |
| parent | 989831d41d1e47795aa3cba45e580511e0590b18 (diff) | |
| download | haskell-4c02b6f5dc4385369aa62160acd6037a32922f84.tar.gz | |
Update Cabal submodule to 1.22 version
| m--------- | libraries/Cabal | 0 | ||||
| -rw-r--r-- | testsuite/tests/driver/T4437.hs | 1 | ||||
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 4 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 | ||||
| -rw-r--r-- | utils/ghctags/ghctags.cabal | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 1d1ecd611560dd719642a9ef3e536caf0df1dc8 +Subproject 82d2fe1f5083e56f0b2d2c2409a3f673a56a5fe diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs index 250eae1d41..72f5f58b61 100644 --- a/testsuite/tests/driver/T4437.hs +++ b/testsuite/tests/driver/T4437.hs @@ -34,7 +34,6 @@ expectedGhcOnlyExtensions = ["RelaxedLayout", "AlternativeLayoutRule", "AlternativeLayoutRuleTransitional", "DeriveAnyClass", - "JavaScriptFFI", "PatternSynonyms", "PartialTypeSignatures", "NamedWildcards", diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 8729fd42be..6724f3ae52 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -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) diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal index 2641f19568..f963c7c333 100644 --- a/utils/ghc-cabal/ghc-cabal.cabal +++ b/utils/ghc-cabal/ghc-cabal.cabal @@ -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 diff --git a/utils/ghctags/ghctags.cabal b/utils/ghctags/ghctags.cabal index cfa841dcb0..7901aa254c 100644 --- a/utils/ghctags/ghctags.cabal +++ b/utils/ghctags/ghctags.cabal @@ -18,6 +18,6 @@ Executable ghctags Build-Depends: base >= 4 && < 5, containers, - Cabal >= 1.20 && <1.22, + Cabal >= 1.22 && <1.24, ghc |