From a25f6f55eaca0d3ec36afb574d5fa9326ea09d55 Mon Sep 17 00:00:00 2001
From: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Tue, 2 Jul 2019 18:22:39 -0400
Subject: [PATCH] Bump template-haskell version to 2.16.0.0
Commit cef80c0b9edca3d21b5c762f51dfbab4c5857d8a debuted a breaking
change to `template-haskell`, so in order to guard against it
properly with CPP, we need to bump the `template-haskell` version
number accordingly.
---
compiler/ghc.cabal.in | 2 +-
libraries/ghci/ghci.cabal.in | 2 +-
libraries/template-haskell/template-haskell.cabal.in | 2 +-
testsuite/tests/th/TH_Roles2.stderr | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 35810cc7c548..1a3d131af4c0 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -74,7 +74,7 @@ Library
containers >= 0.5 && < 0.7,
array >= 0.1 && < 0.6,
filepath >= 1 && < 1.5,
- template-haskell == 2.15.*,
+ template-haskell == 2.16.*,
hpc == 0.6.*,
transformers == 0.5.*,
ghc-boot == @ProjectVersionMunged@,
diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in
index f4c49137cc9d..4da94b3549b9 100644
--- a/libraries/ghci/ghci.cabal.in
+++ b/libraries/ghci/ghci.cabal.in
@@ -92,7 +92,7 @@ library
ghc-boot == @ProjectVersionMunged@,
ghc-boot-th == @ProjectVersionMunged@,
ghc-heap == @ProjectVersionMunged@,
- template-haskell == 2.15.*,
+ template-haskell == 2.16.*,
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 7acbf026c123..ebedcda65038 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.15.0.0
+version: 2.16.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 9abf9adccbb4..81866fdf6f9a 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.6.1, integer-gmp-1.0.2.0,
- pretty-1.1.3.6, template-haskell-2.15.0.0]
+ pretty-1.1.3.6, template-haskell-2.16.0.0]
==================== Typechecker ====================
TH_Roles2.$tcT
--
GitLab