summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Scott <ryan.gl.scott@gmail.com>2020-04-12 17:14:32 -0400
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-04-14 23:32:14 -0400
commit0b934e30417a767063625494ecf135c9d6006f71 (patch)
tree0f39156ff7ddc822c68cada4c4a808f9e8689fec
parent19de2fb090a25ab0d640d0cd5aef09f35e7455a0 (diff)
downloadhaskell-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 -------------------------
-rw-r--r--compiler/ghc.cabal.in2
-rw-r--r--ghc.mk10
m---------libraries/exceptions0
-rw-r--r--libraries/ghci/ghci.cabal.in2
-rw-r--r--libraries/template-haskell/template-haskell.cabal.in2
m---------libraries/text0
-rw-r--r--utils/ghc-cabal/ghc.mk4
7 files changed, 10 insertions, 10 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index a6292f5d5a..e05d5a1617 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -69,7 +69,7 @@ Library
containers >= 0.5 && < 0.7,
array >= 0.1 && < 0.6,
filepath >= 1 && < 1.5,
- template-haskell == 2.16.*,
+ template-haskell == 2.17.*,
hpc == 0.6.*,
transformers == 0.5.*,
ghc-boot == @ProjectVersionMunged@,
diff --git a/ghc.mk b/ghc.mk
index 53731ae64f..af24c807b3 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -413,8 +413,8 @@ else # CLEANING
# Packages that are built by stage0. These packages are dependencies of
# programs such as GHC and ghc-pkg, that we do not assume the stage0
# compiler already has installed (or up-to-date enough).
-
-PACKAGES_STAGE0 = binary text transformers mtl parsec Cabal/Cabal hpc ghc-boot-th ghc-boot template-haskell ghc-heap ghci
+# Note that these must be given in topological order.
+PACKAGES_STAGE0 = binary transformers mtl hpc ghc-boot-th ghc-boot template-haskell text parsec Cabal/Cabal ghc-heap ghci
ifeq "$(Windows_Host)" "NO"
PACKAGES_STAGE0 += terminfo
endif
@@ -441,14 +441,14 @@ PACKAGES_STAGE1 += process
PACKAGES_STAGE1 += hpc
PACKAGES_STAGE1 += pretty
PACKAGES_STAGE1 += binary
-PACKAGES_STAGE1 += text
PACKAGES_STAGE1 += transformers
PACKAGES_STAGE1 += mtl
-PACKAGES_STAGE1 += parsec
-PACKAGES_STAGE1 += Cabal/Cabal
PACKAGES_STAGE1 += ghc-boot-th
PACKAGES_STAGE1 += ghc-boot
PACKAGES_STAGE1 += template-haskell
+PACKAGES_STAGE1 += text
+PACKAGES_STAGE1 += parsec
+PACKAGES_STAGE1 += Cabal/Cabal
PACKAGES_STAGE1 += ghc-compact
PACKAGES_STAGE1 += ghc-heap
diff --git a/libraries/exceptions b/libraries/exceptions
-Subproject 0a1f9ff0f407da360fc9405a07d5d06d28e6c07
+Subproject fe4166f8d23d8288ef2cbbf9e36118b6b99e0d7
diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in
index 62f8ec43a5..11d144c5b3 100644
--- a/libraries/ghci/ghci.cabal.in
+++ b/libraries/ghci/ghci.cabal.in
@@ -81,7 +81,7 @@ library
ghc-boot == @ProjectVersionMunged@,
ghc-boot-th == @ProjectVersionMunged@,
ghc-heap == @ProjectVersionMunged@,
- template-haskell == 2.16.*,
+ template-haskell == 2.17.*,
transformers == 0.5.*
if !os(windows)
diff --git a/libraries/template-haskell/template-haskell.cabal.in b/libraries/template-haskell/template-haskell.cabal.in
index 6374681906..10f64895bc 100644
--- a/libraries/template-haskell/template-haskell.cabal.in
+++ b/libraries/template-haskell/template-haskell.cabal.in
@@ -3,7 +3,7 @@
-- template-haskell.cabal.
name: template-haskell
-version: 2.16.0.0
+version: 2.17.0.0
-- NOTE: Don't forget to update ./changelog.md
license: BSD3
license-file: LICENSE
diff --git a/libraries/text b/libraries/text
-Subproject 1127b30e1e0affa08f056e35ad17957b12982ba
+Subproject a01843250166b5559936ba5eb81f7873e709587
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)