diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2020-04-12 17:14:32 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2020-04-14 23:32:14 -0400 |
| commit | 0b934e30417a767063625494ecf135c9d6006f71 (patch) | |
| tree | 0f39156ff7ddc822c68cada4c4a808f9e8689fec /utils | |
| parent | 19de2fb090a25ab0d640d0cd5aef09f35e7455a0 (diff) | |
| download | haskell-0b934e30417a767063625494ecf135c9d6006f71.tar.gz | |
Bump template-haskell version to 2.17.0.0
This requires bumping the `exceptions` and `text` submodules to bring
in commits that bump their respective upper version bounds on
`template-haskell`.
Fixes #17645. Fixes #17696.
Note that the new `text` commit includes a fair number of additions
to the Haddocks in that library. As a result, Haddock has to do more
work during the `haddock.Cabal` test case, increasing the number of
allocations it requires. Therefore,
-------------------------
Metric Increase:
haddock.Cabal
-------------------------
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index 90a47ddf98..381bc53a02 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -23,9 +23,9 @@ CABAL_CONSTRAINT := --constraint="Cabal == $(CABAL_DOTTED_VERSION)" # macros is triggered by `-hide-all-packages`, so we have to explicitly # enumerate all packages we need in scope. ifeq "$(Windows_Host)" "YES" -CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory filepath Win32 +CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory filepath Win32 template-haskell else -CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory filepath unix +CABAL_BUILD_DEPS := ghc-prim base array transformers time containers bytestring deepseq process pretty directory filepath unix template-haskell endif ghc-cabal_DIST_BINARY_NAME = ghc-cabal$(exeext0) |