diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2021-03-17 20:23:47 -0400 |
|---|---|---|
| committer | Ryan Scott <ryan.gl.scott@gmail.com> | 2021-03-20 15:12:12 -0400 |
| commit | 6a375b5365b3d0c74198dbd702beda6632890454 (patch) | |
| tree | 1e20c20a66f7e635f3b87cc4da46a59ab6f5e51a | |
| parent | 91ddac2f859a8fb37e2a295f94676c9705fe0227 (diff) | |
| download | haskell-6a375b5365b3d0c74198dbd702beda6632890454.tar.gz | |
Bump template-haskell version to 2.18.0.0wip/T19083
This requires bumping the `exceptions` and `text` submodules to bring in
commits that bump their respective upper version bounds on `template-haskell`.
Fixes #19083.
| -rw-r--r-- | compiler/ghc.cabal.in | 2 | ||||
| m--------- | libraries/exceptions | 0 | ||||
| -rw-r--r-- | libraries/ghci/ghci.cabal.in | 2 | ||||
| -rw-r--r-- | libraries/template-haskell/template-haskell.cabal.in | 2 | ||||
| m--------- | libraries/text | 0 | ||||
| -rw-r--r-- | testsuite/tests/th/TH_Roles2.stderr | 6 |
6 files changed, 6 insertions, 6 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index ded5bc4c07..dd216823d2 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -67,7 +67,7 @@ Library containers >= 0.6.2.1 && < 0.7, array >= 0.1 && < 0.6, filepath >= 1 && < 1.5, - template-haskell == 2.17.*, + template-haskell == 2.18.*, hpc == 0.6.*, transformers == 0.5.*, exceptions == 0.10.*, diff --git a/libraries/exceptions b/libraries/exceptions -Subproject 23c0b8a50d7592af37ca09beeec16b93080df98 +Subproject ebc21bd7efc858571935440dc9c4178d448448c diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in index d2db85c76b..ffba9d670b 100644 --- a/libraries/ghci/ghci.cabal.in +++ b/libraries/ghci/ghci.cabal.in @@ -80,7 +80,7 @@ library filepath == 1.4.*, ghc-boot == @ProjectVersionMunged@, ghc-heap == @ProjectVersionMunged@, - template-haskell == 2.17.*, + template-haskell == 2.18.*, 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 950b247614..963e547a58 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.17.0.0 +version: 2.18.0.0 -- NOTE: Don't forget to update ./changelog.md license: BSD3 license-file: LICENSE diff --git a/libraries/text b/libraries/text -Subproject 853471cc714922a9f914342fa0bb9ef10e5b415 +Subproject 66bb23baf6ba7803c1a87cfeec16671b26acde0 diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr index 43ce297d3a..35ed3cc39f 100644 --- a/testsuite/tests/th/TH_Roles2.stderr +++ b/testsuite/tests/th/TH_Roles2.stderr @@ -2,9 +2,9 @@ TYPE CONSTRUCTORS data type T{2} :: forall k. k -> * roles nominal representational Dependent modules: [] -Dependent packages: [array-0.5.4.0, base-4.15.0.0, deepseq-1.4.4.0, - ghc-bignum-1.0, ghc-boot-th-9.1.0.20201005, ghc-prim-0.7.0, - pretty-1.1.3.6, template-haskell-2.17.0.0] +Dependent packages: [array-0.5.4.0, base-4.16.0.0, deepseq-1.4.4.0, + ghc-bignum-1.0, ghc-boot-th-9.1, ghc-prim-0.8.0, pretty-1.1.3.6, + template-haskell-2.18.0.0] ==================== Typechecker ==================== TH_Roles2.$tcT |