summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2015-08-12 09:48:53 +0200
committerHerbert Valerio Riedel <hvr@gnu.org>2015-08-12 10:52:15 +0200
commit8cce7e4bc8f17f1c9ef4d4028b5145829fc3334b (patch)
tree2d620b850f665e0cbb23437a88ef4c9fb1762c83
parent2b4710b116e7f6e122e0234ca140d44287d55435 (diff)
downloadhaskell-8cce7e4bc8f17f1c9ef4d4028b5145829fc3334b.tar.gz
Bump template-haskell to new major version 2.11
...since we already have introduced backward compat breakage that breaks packages such as QuickCheck-2.8.1 Differential Revision: https://phabricator.haskell.org/D1144
-rw-r--r--libraries/template-haskell/changelog.md7
-rw-r--r--libraries/template-haskell/template-haskell.cabal2
-rw-r--r--testsuite/tests/th/TH_Roles2.stderr2
3 files changed, 9 insertions, 2 deletions
diff --git a/libraries/template-haskell/changelog.md b/libraries/template-haskell/changelog.md
index f205ed500a..864abe52bf 100644
--- a/libraries/template-haskell/changelog.md
+++ b/libraries/template-haskell/changelog.md
@@ -1,5 +1,12 @@
# Changelog for [`template-haskell` package](http://hackage.haskell.org/package/template-haskell)
+## 2.11.0.0 *TBA*
+
+ * Bundled with GHC 7.12.1
+
+ * TODO: document API changes and important bugfixes
+
+
## 2.10.0.0 *Mar 2015*
* Bundled with GHC 7.10.1
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index de71132814..4bfd1a96a7 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -1,5 +1,5 @@
name: template-haskell
-version: 2.10.0.0
+version: 2.11.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 98029ab3a8..8611b92691 100644
--- a/testsuite/tests/th/TH_Roles2.stderr
+++ b/testsuite/tests/th/TH_Roles2.stderr
@@ -6,7 +6,7 @@ COERCION AXIOMS
Dependent modules: []
Dependent packages: [pretty-1.1.2.0, deepseq-1.4.1.1,
array-0.5.1.0, base-4.8.2.0, ghc-prim-0.4.0.0, integer-gmp-1.0.0.0,
- template-haskell-2.10.0.0]
+ template-haskell-2.11.0.0]
==================== Typechecker ====================