summaryrefslogtreecommitdiff
path: root/ghc.mk
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 /ghc.mk
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 -------------------------
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk10
1 files changed, 5 insertions, 5 deletions
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