[Git][ghc/ghc][wip/T17645-T17696] Bump template-haskell version to 2.17.0.0

[Ryan Scott]

Ryan Scott pushed to branch wip/T17645-T17696 at Glasgow Haskell Compiler / GHC


Commits:
4b6589e2 by Ryan Scott at 2020-04-13T11:33:21-04:00
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
-------------------------

- - - - -


7 changed files:

- compiler/ghc.cabal.in
- ghc.mk
- libraries/exceptions
- libraries/ghci/ghci.cabal.in
- libraries/template-haskell/template-haskell.cabal.in
- libraries/text
- utils/ghc-cabal/ghc.mk


Changes:

=====================================
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@,


=====================================
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
 


=====================================
libraries/exceptions
=====================================
@@ -1 +1 @@
-Subproject commit 0a1f9ff0f407da360fc9405a07d5d06d28e6c077
+Subproject commit fe4166f8d23d8288ef2cbbf9e36118b6b99e0d7d


=====================================
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)


=====================================
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


=====================================
libraries/text
=====================================
@@ -1 +1 @@
-Subproject commit 1127b30e1e0affa08f056e35ad17957b12982ba3
+Subproject commit a01843250166b5559936ba5eb81f7873e709587a


=====================================
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)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4b6589e21b100672fcef3b067deaf71ef2fc83bd

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4b6589e21b100672fcef3b067deaf71ef2fc83bd
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200413/cfdb5c8a/attachment-0001.html>