Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Tobias Decking
GHC
Commits
4c02b6f5
Commit
4c02b6f5
authored
Dec 18, 2014
by
Herbert Valerio Riedel
🕺
Browse files
Update Cabal submodule to 1.22 version
parent
989831d4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Cabal
@
82d2fe1f
Compare
1d1ecd61
...
82d2fe1f
Subproject commit
1d1ecd611560dd719642a9ef3e536caf0df1dc8c
Subproject commit
82d2fe1f5083e56f0b2d2c2409a3f673a56a5fe4
testsuite/tests/driver/T4437.hs
View file @
4c02b6f5
...
...
@@ -34,7 +34,6 @@ expectedGhcOnlyExtensions = ["RelaxedLayout",
"AlternativeLayoutRule"
,
"AlternativeLayoutRuleTransitional"
,
"DeriveAnyClass"
,
"JavaScriptFFI"
,
"PatternSynonyms"
,
"PartialTypeSignatures"
,
"NamedWildcards"
,
...
...
utils/ghc-cabal/Main.hs
View file @
4c02b6f5
...
...
@@ -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
)
...
...
utils/ghc-cabal/ghc-cabal.cabal
View file @
4c02b6f5
...
...
@@ -17,7 +17,7 @@ Executable ghc-cabal
Build-Depends: base >= 3 && < 5,
bytestring >= 0.10 && < 0.11,
Cabal >= 1.2
0
&& < 1.2
2
,
Cabal >= 1.2
2
&& < 1.2
4
,
directory >= 1.1 && < 1.3,
filepath >= 1.2 && < 1.4
utils/ghctags/ghctags.cabal
View file @
4c02b6f5
...
...
@@ -18,6 +18,6 @@ Executable ghctags
Build-Depends: base >= 4 && < 5,
containers,
Cabal >= 1.2
0
&& <1.2
2
,
Cabal >= 1.2
2
&& <1.2
4
,
ghc
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment