diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2018-04-09 12:56:51 -0400 |
|---|---|---|
| committer | Ryan Scott <ryan.gl.scott@gmail.com> | 2018-04-09 12:56:52 -0400 |
| commit | 48f55e764bb41848cff759fbea3211d8a0bbfd5b (patch) | |
| tree | 8a9647a877790968309f30d1638a38395c781a12 | |
| parent | b14c03737574895718eed786a60dfdfd42ab49ce (diff) | |
| download | haskell-48f55e764bb41848cff759fbea3211d8a0bbfd5b.tar.gz | |
Bump template-haskell to 2.14.0.0
Summary:
There has been at least one breaking change to
`template-haskell` (the removal of `qAddForeignFile`) which is
causing packages like `th-orphans` and `singletons` to fail to build
with GHC HEAD. Let's bump `template-haskell`'s major version number
so that these packages can properly guard against these changes.
While I was in town, I also started a `changelog` section for
the next major version of `template-haskell`, and copied over
finishing touches for `template-haskell-2.13.0.0`.
Test Plan: ./validate
Reviewers: bgamari
Reviewed By: bgamari
Subscribers: thomie, carter
Differential Revision: https://phabricator.haskell.org/D4558
| -rw-r--r-- | compiler/ghc.cabal.in | 2 | ||||
| -rw-r--r-- | libraries/ghci/ghci.cabal.in | 2 | ||||
| -rw-r--r-- | libraries/template-haskell/changelog.md | 20 | ||||
| -rw-r--r-- | libraries/template-haskell/template-haskell.cabal | 2 | ||||
| -rw-r--r-- | testsuite/tests/th/TH_Roles2.stderr | 2 |
5 files changed, 22 insertions, 6 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 5ffc3cebfd..a34990475d 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -59,7 +59,7 @@ Library containers >= 0.5 && < 0.6, array >= 0.1 && < 0.6, filepath >= 1 && < 1.5, - template-haskell == 2.13.*, + template-haskell == 2.14.*, hpc == 0.6.*, transformers == 0.5.*, ghc-boot == @ProjectVersionMunged@, diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in index c22f6052d1..595f8deb76 100644 --- a/libraries/ghci/ghci.cabal.in +++ b/libraries/ghci/ghci.cabal.in @@ -77,7 +77,7 @@ library filepath == 1.4.*, ghc-boot == @ProjectVersionMunged@, ghc-boot-th == @ProjectVersionMunged@, - template-haskell == 2.13.*, + template-haskell == 2.14.*, transformers == 0.5.* if !os(windows) diff --git a/libraries/template-haskell/changelog.md b/libraries/template-haskell/changelog.md index b4728329d1..41b7eea26c 100644 --- a/libraries/template-haskell/changelog.md +++ b/libraries/template-haskell/changelog.md @@ -1,8 +1,24 @@ # Changelog for [`template-haskell` package](http://hackage.haskell.org/package/template-haskell) -## 2.13.0.0 *TBA* +## 2.14.0.0 *TBA* - * Bundled with GHC *TBA* + * Introduce an `addForeignFilePath` function, as well as a corresponding + `qAddForeignFile` class method to `Quasi`. Unlike `addForeingFile`, which + takes the contents of the file as an argument, `addForeignFilePath` takes + as an argument a path pointing to a foreign file. A new `addForeignSource` + function has also been added which takes a file's contents as an argument. + + The old `addForeignFile` function is now deprecated in favor of + `addForeignSource`, and the `qAddForeignFile` method of `Quasi` has been + removed entirely. + + * Introduce an `addTempFile` function, as well as a corresponding + `qAddTempFile` method to `Quasi`, which requests a temporary file of + a given suffix. + +## 2.13.0.0 *March 2018* + + * Bundled with GHC 8.4.1 * `Language.Haskell.TH.FamFlavour`, which was deprecated in 2.11, has been removed. diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal index 7770a38405..b0bc10ec9f 100644 --- a/libraries/template-haskell/template-haskell.cabal +++ b/libraries/template-haskell/template-haskell.cabal @@ -1,5 +1,5 @@ name: template-haskell -version: 2.13.0.0 +version: 2.14.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 b8e0d72652..09b4bea14c 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: [array-0.5.2.0, base-4.11.0.0, deepseq-1.4.3.0, ghc-boot-th-8.3, ghc-prim-0.5.2.0, integer-gmp-1.0.1.0, - pretty-1.1.3.5, template-haskell-2.13.0.0] + pretty-1.1.3.5, template-haskell-2.14.0.0] ==================== Typechecker ==================== TH_Roles2.$tcT |