Commit 4c02b6f5 authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺
Browse files

Update Cabal submodule to 1.22 version

parent 989831d4
Subproject commit 1d1ecd611560dd719642a9ef3e536caf0df1dc8c Subproject commit 82d2fe1f5083e56f0b2d2c2409a3f673a56a5fe4
...@@ -34,7 +34,6 @@ expectedGhcOnlyExtensions = ["RelaxedLayout", ...@@ -34,7 +34,6 @@ expectedGhcOnlyExtensions = ["RelaxedLayout",
"AlternativeLayoutRule", "AlternativeLayoutRule",
"AlternativeLayoutRuleTransitional", "AlternativeLayoutRuleTransitional",
"DeriveAnyClass", "DeriveAnyClass",
"JavaScriptFFI",
"PatternSynonyms", "PatternSynonyms",
"PartialTypeSignatures", "PartialTypeSignatures",
"NamedWildcards", "NamedWildcards",
......
...@@ -10,6 +10,7 @@ import Distribution.System ...@@ -10,6 +10,7 @@ import Distribution.System
import Distribution.Simple import Distribution.Simple
import Distribution.Simple.Configure import Distribution.Simple.Configure
import Distribution.Simple.LocalBuildInfo import Distribution.Simple.LocalBuildInfo
import Distribution.Simple.GHC
import Distribution.Simple.Program import Distribution.Simple.Program
import Distribution.Simple.Program.HcPkg import Distribution.Simple.Program.HcPkg
import Distribution.Simple.Setup (ConfigFlags(configStripLibs), fromFlag, toFlag) import Distribution.Simple.Setup (ConfigFlags(configStripLibs), fromFlag, toFlag)
...@@ -224,8 +225,7 @@ doRegister directory distDir ghc ghcpkg topdir ...@@ -224,8 +225,7 @@ doRegister directory distDir ghc ghcpkg topdir
configurePrograms ps conf = foldM (flip (configureProgram verbosity)) conf ps configurePrograms ps conf = foldM (flip (configureProgram verbosity)) conf ps
progs' <- configurePrograms [ghcProgram', ghcPkgProgram'] progs progs' <- configurePrograms [ghcProgram', ghcPkgProgram'] progs
let Just ghcPkgProg = lookupProgram ghcPkgProgram' progs' instInfos <- dump (hcPkgInfo progs') verbosity GlobalPackageDB
instInfos <- dump verbosity ghcPkgProg GlobalPackageDB
let installedPkgs' = PackageIndex.fromList instInfos let installedPkgs' = PackageIndex.fromList instInfos
let updateComponentConfig (cn, clbi, deps) let updateComponentConfig (cn, clbi, deps)
= (cn, updateComponentLocalBuildInfo clbi, deps) = (cn, updateComponentLocalBuildInfo clbi, deps)
......
...@@ -17,7 +17,7 @@ Executable ghc-cabal ...@@ -17,7 +17,7 @@ Executable ghc-cabal
Build-Depends: base >= 3 && < 5, Build-Depends: base >= 3 && < 5,
bytestring >= 0.10 && < 0.11, bytestring >= 0.10 && < 0.11,
Cabal >= 1.20 && < 1.22, Cabal >= 1.22 && < 1.24,
directory >= 1.1 && < 1.3, directory >= 1.1 && < 1.3,
filepath >= 1.2 && < 1.4 filepath >= 1.2 && < 1.4
...@@ -18,6 +18,6 @@ Executable ghctags ...@@ -18,6 +18,6 @@ Executable ghctags
Build-Depends: base >= 4 && < 5, Build-Depends: base >= 4 && < 5,
containers, containers,
Cabal >= 1.20 && <1.22, Cabal >= 1.22 && <1.24,
ghc ghc
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment