summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Scott <ryan.gl.scott@gmail.com>2018-10-28 22:25:05 -0400
committerRyan Scott <ryan.gl.scott@gmail.com>2018-10-28 22:25:05 -0400
commite8a652f65318cf60e856f7c2777a003eba10ddc6 (patch)
tree0165cb96bff4d3ec6fa770142810d51e7d87f37e
parent5126764be614cc43b435e3f5ff34ea593c30269a (diff)
downloadhaskell-e8a652f65318cf60e856f7c2777a003eba10ddc6.tar.gz
Bump template-haskell version to 2.15.0.0
Summary: Commit 512eeb9bb9a81e915bfab25ca16bc87c62252064 (`More explicit foralls (GHC Proposal 0007)`) introduced breaking changes to the Template Haskell AST. As a consequence of this, there are libraries in the wild that now fail to build on GHC HEAD (for instance, `th-abstraction`). This properly bumps the `template-haskell` library's version number to `2.15.0.0` so that these libraries can guard against these changes using `MIN_VERSION_template_haskell`. Test Plan: ./validate Reviewers: bgamari Reviewed By: bgamari Subscribers: rwbarton, carter GHC Trac Issues: #15818 Differential Revision: https://phabricator.haskell.org/D5272
-rw-r--r--compiler/ghc.cabal.in2
-rw-r--r--libraries/ghci/ghci.cabal.in2
-rw-r--r--libraries/template-haskell/template-haskell.cabal2
-rw-r--r--testsuite/tests/th/TH_Roles2.stderr2
4 files changed, 4 insertions, 4 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 5c9d88f8cc..f952b88805 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -64,7 +64,7 @@ Library
containers >= 0.5 && < 0.7,
array >= 0.1 && < 0.6,
filepath >= 1 && < 1.5,
- template-haskell == 2.14.*,
+ template-haskell == 2.15.*,
hpc == 0.6.*,
transformers == 0.5.*,
ghc-boot == @ProjectVersionMunged@,
diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in
index f49acf5665..467ed8f564 100644
--- a/libraries/ghci/ghci.cabal.in
+++ b/libraries/ghci/ghci.cabal.in
@@ -79,7 +79,7 @@ library
ghc-boot == @ProjectVersionMunged@,
ghc-boot-th == @ProjectVersionMunged@,
ghc-heap == @ProjectVersionMunged@,
- template-haskell == 2.14.*,
+ template-haskell == 2.15.*,
transformers == 0.5.*
if !os(windows)
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index 2b2c5db463..90d67fc774 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -1,5 +1,5 @@
name: template-haskell
-version: 2.14.0.0
+version: 2.15.0.0
-- NOTE: Don't forget to update ./changelog.md
license: BSD3
license-file: LICENSE
diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr
index 3752e8c96a..c988015622 100644
--- a/testsuite/tests/th/TH_Roles2.stderr
+++ b/testsuite/tests/th/TH_Roles2.stderr
@@ -4,7 +4,7 @@ TYPE CONSTRUCTORS
Dependent modules: []
Dependent packages: [array-0.5.2.0, base-4.12.0.0, deepseq-1.4.4.0,
ghc-boot-th-8.7, ghc-prim-0.5.3, integer-gmp-1.0.2.0,
- pretty-1.1.3.6, template-haskell-2.14.0.0]
+ pretty-1.1.3.6, template-haskell-2.15.0.0]
==================== Typechecker ====================
TH_Roles2.$tcT