summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2023-01-16 11:53:22 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2023-01-23 04:51:08 -0500
commit3efd1e9934d9896e6c816e6cafb41b6872e3015b (patch)
treec5e9cfe6823569503ed71a8fc0f4a44ebb44b5f8
parentfec7c2ea8242773b53b253d9536426f743443944 (diff)
downloadhaskell-3efd1e9934d9896e6c816e6cafb41b6872e3015b.tar.gz
template-haskell: Bump version to 2.20.0.0
Updates `text` and `exceptions` submodules for bounds bumps. Addresses #22767.
-rw-r--r--compiler/ghc.cabal.in2
m---------libraries/exceptions0
-rw-r--r--libraries/ghci/ghci.cabal.in2
-rw-r--r--libraries/template-haskell/template-haskell.cabal.in2
m---------libraries/text0
-rw-r--r--testsuite/tests/ghci/scripts/T21110.stderr2
-rw-r--r--testsuite/tests/package/T4806a.stderr2
7 files changed, 5 insertions, 5 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 8e8bafbf8a..aea74cfb49 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -81,7 +81,7 @@ Library
containers >= 0.6.2.1 && < 0.7,
array >= 0.1 && < 0.6,
filepath >= 1 && < 1.5,
- template-haskell == 2.19.*,
+ template-haskell == 2.20.*,
hpc == 0.6.*,
transformers >= 0.5 && < 0.7,
exceptions == 0.10.*,
diff --git a/libraries/exceptions b/libraries/exceptions
-Subproject 0f17c9819fd4216ac591bb0acc4aa71b2ae5a73
+Subproject a473e4fa1acdbcfc7cc96f84ae3f2cb38261e08
diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in
index 6980877ed9..78466a814a 100644
--- a/libraries/ghci/ghci.cabal.in
+++ b/libraries/ghci/ghci.cabal.in
@@ -79,7 +79,7 @@ library
filepath == 1.4.*,
ghc-boot == @ProjectVersionMunged@,
ghc-heap == @ProjectVersionMunged@,
- template-haskell == 2.19.*,
+ template-haskell == 2.20.*,
transformers >= 0.5 && < 0.7
if !os(windows)
diff --git a/libraries/template-haskell/template-haskell.cabal.in b/libraries/template-haskell/template-haskell.cabal.in
index fb1a03f2e7..5cee75cd06 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.19.0.0
+version: 2.20.0.0
-- NOTE: Don't forget to update ./changelog.md
license: BSD3
license-file: LICENSE
diff --git a/libraries/text b/libraries/text
-Subproject 5558730e76923f2d5d7fbc8783ab1ecc25bfe15
+Subproject 197bbcb18977593a06b048ad58abe71c6119799
diff --git a/testsuite/tests/ghci/scripts/T21110.stderr b/testsuite/tests/ghci/scripts/T21110.stderr
index 13fe02def1..8674c36336 100644
--- a/testsuite/tests/ghci/scripts/T21110.stderr
+++ b/testsuite/tests/ghci/scripts/T21110.stderr
@@ -2,4 +2,4 @@
<no location info>: warning: [GHC-42258] [-Wunused-packages]
The following packages were specified via -package or -package-id flags,
but were not needed for compilation:
- - template-haskell-2.19.0.0 (exposed by flag -package template-haskell)
+ - template-haskell-2.20.0.0 (exposed by flag -package template-haskell)
diff --git a/testsuite/tests/package/T4806a.stderr b/testsuite/tests/package/T4806a.stderr
index 9bab35bcd7..fe98798453 100644
--- a/testsuite/tests/package/T4806a.stderr
+++ b/testsuite/tests/package/T4806a.stderr
@@ -3,5 +3,5 @@ T4806a.hs:1:1: error:
Could not load module ‘Data.Map’
It is a member of the package ‘containers-0.6.6’
which is unusable because the -ignore-package flag was used to ignore at least one of its dependencies:
- deepseq-1.4.8.0 template-haskell-2.19.0.0
+ deepseq-1.4.8.0 template-haskell-2.20.0.0
Use -v (or `:set -v` in ghci) to see a list of the files searched for.