From 8475b19b9eb5fe08af8dcf96b8a50f6ccdfb7f18 Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Tue, 7 May 2019 20:32:07 -0700 Subject: [PATCH 1/4] =?UTF-8?q?Version=201.22.0=20=E2=86=92=201.22.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dhall/CHANGELOG.md | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dhall/dhall.cabal | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) diff --git a/dhall/CHANGELOG.md b/dhall/CHANGELOG.md index 611e5bd21..63c55dca0 100644 --- a/dhall/CHANGELOG.md +++ b/dhall/CHANGELOG.md @@ -1,3 +1,49 @@ +1.22.1 + +* BUG FIX: Fix marshaling union literals + * 1.22.0 introduced two separate bugs in marshaling union literals between + Dhall and Haskell, which this release fixes: + * Dhall enums did not correctly map onto Haskell enums + * New-style union literals (i.e. `< A : T >.A x`) were not correctly + supported + * See: https://github.com/dhall-lang/dhall-haskell/pull/918 + * See: https://github.com/dhall-lang/dhall-haskell/pull/927 +* BUG FIX: Fix α-normalization + * Version 1.22.0 introduced a new faster evaluation algorithm, but the new + algorithm introduced two α-normalization regression, which this release + fixes + * The primary effect of this bug was that semantic integrity checks would + fail for expressions that contain an `if`/`then`/else` expression in their + normal form + * See: https://github.com/dhall-lang/dhall-haskell/pull/931 + * See: https://github.com/dhall-lang/dhall-haskell/pull/938 +* BUG FIX: Fix merging of sort-level record types + * The language standard requires that `{ a : Kind } ⩓ { b : Kind }` is + valid, which this change fixes + * See: https://github.com/dhall-lang/dhall-haskell/pull/891 +* BUG FIX: `dhall freeze` respects the `--ascii` flag + * See: https://github.com/dhall-lang/dhall-haskell/pull/934 +* BUG FIX: Don't autocomplete fields for record types + * This prevents the REPL from expanding `{ x : T }.` to `{ x : T }.x` + * See: https://github.com/dhall-lang/dhall-haskell/pull/937 +* Support GHC 8.8 + * See: https://github.com/dhall-lang/dhall-haskell/pull/912 +* Add `cross` flag to simplify cross-compilation + * This allows the `dhall` package to be built without using + `TemplateHaskell` + * See: https://github.com/dhall-lang/dhall-haskell/pull/928 +* Increase lines of context for error messages + * Error messages now provide at least 20 lines of context instead of 3 + before truncating large expressions + * See: https://github.com/dhall-lang/dhall-haskell/pull/916 +* Add line numbers to error messages + * The bottom of every Dhall type error includes the original source code, + which now has line numbers on the left margin + * See: https://github.com/dhall-lang/dhall-haskell/pull/919 +* Expand lower bounds on `megaparsec`/`transformers-compat` dependencies + * This is to support `dhall` on Debian Sid + * See: https://github.com/dhall-lang/dhall-haskell/pull/939 + 1.22.0 * Supports version 7.0.0 of the standard diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index 2fac43704..ae7f438a4 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -1,5 +1,5 @@ Name: dhall -Version: 1.22.0 +Version: 1.22.1 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 7.10.3, GHC == 8.4.3, GHC == 8.6.1 From c2b10fbd70bbe4724ed995974e39b2f9a2e93e23 Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Sat, 11 May 2019 03:30:46 +0000 Subject: [PATCH 2/4] Mention #936 ... as caught by @quasicomputational --- dhall/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/dhall/CHANGELOG.md b/dhall/CHANGELOG.md index 63c55dca0..93c74ae5e 100644 --- a/dhall/CHANGELOG.md +++ b/dhall/CHANGELOG.md @@ -8,6 +8,7 @@ supported * See: https://github.com/dhall-lang/dhall-haskell/pull/918 * See: https://github.com/dhall-lang/dhall-haskell/pull/927 + * See: https://github.com/dhall-lang/dhall-haskell/pull/936 * BUG FIX: Fix α-normalization * Version 1.22.0 introduced a new faster evaluation algorithm, but the new algorithm introduced two α-normalization regression, which this release From efccd20bd85d1ba5fd4002f7d1225b827d541a2b Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Sat, 11 May 2019 03:31:26 +0000 Subject: [PATCH 3/4] Clarify that GHC 8.8 support is still incomplete ... as mentioned by @quasicomputational --- dhall/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhall/CHANGELOG.md b/dhall/CHANGELOG.md index 93c74ae5e..c4d5c314a 100644 --- a/dhall/CHANGELOG.md +++ b/dhall/CHANGELOG.md @@ -27,7 +27,7 @@ * BUG FIX: Don't autocomplete fields for record types * This prevents the REPL from expanding `{ x : T }.` to `{ x : T }.x` * See: https://github.com/dhall-lang/dhall-haskell/pull/937 -* Support GHC 8.8 +* Support `MonadFail`-related changes in GHC 8.8 * See: https://github.com/dhall-lang/dhall-haskell/pull/912 * Add `cross` flag to simplify cross-compilation * This allows the `dhall` package to be built without using From 50a83db265b072220f510ef325a1e87c969966b1 Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Sat, 11 May 2019 14:40:45 +0000 Subject: [PATCH 4/4] Change version number to 1.23.0 to indicate a breaking change ... as suggested by @quasicomputational --- dhall-bash/dhall-bash.cabal | 2 +- dhall-json/dhall-json.cabal | 2 +- dhall-nix/dhall-nix.cabal | 2 +- dhall-text/dhall-text.cabal | 2 +- dhall-try/dhall-try.cabal | 2 +- dhall/CHANGELOG.md | 4 ++-- dhall/dhall.cabal | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dhall-bash/dhall-bash.cabal b/dhall-bash/dhall-bash.cabal index 4b83b57f7..58892c395 100644 --- a/dhall-bash/dhall-bash.cabal +++ b/dhall-bash/dhall-bash.cabal @@ -31,7 +31,7 @@ Library base >= 4.8.0.0 && < 5 , bytestring < 0.11, containers < 0.7 , - dhall >= 1.22.0 && < 1.23, + dhall >= 1.22.0 && < 1.24, neat-interpolation < 0.4 , shell-escape < 0.3 , text >= 0.2 && < 1.3 diff --git a/dhall-json/dhall-json.cabal b/dhall-json/dhall-json.cabal index e1a2afea2..e0aeb85c4 100644 --- a/dhall-json/dhall-json.cabal +++ b/dhall-json/dhall-json.cabal @@ -35,7 +35,7 @@ Library Build-Depends: base >= 4.8.0.0 && < 5 , aeson >= 1.0.0.0 && < 1.5 , - dhall >= 1.22.0 && < 1.23, + dhall >= 1.22.0 && < 1.24, optparse-applicative >= 0.14.0.0 && < 0.15, text >= 0.11.1.0 && < 1.3 , unordered-containers < 0.3 diff --git a/dhall-nix/dhall-nix.cabal b/dhall-nix/dhall-nix.cabal index 73ff8fe79..949802348 100644 --- a/dhall-nix/dhall-nix.cabal +++ b/dhall-nix/dhall-nix.cabal @@ -30,7 +30,7 @@ Library base >= 4.8.0.0 && < 5 , containers < 0.7 , data-fix < 0.3 , - dhall >= 1.22 && < 1.23, + dhall >= 1.22 && < 1.24, hnix >= 0.5 && < 0.7 , neat-interpolation < 0.4 , text >= 0.8.0.0 && < 1.3 diff --git a/dhall-text/dhall-text.cabal b/dhall-text/dhall-text.cabal index 74209b59e..d57013d56 100644 --- a/dhall-text/dhall-text.cabal +++ b/dhall-text/dhall-text.cabal @@ -25,7 +25,7 @@ Executable dhall-to-text Main-Is: Main.hs Build-Depends: base >= 4.8.0.0 && < 5 , - dhall >= 1.15.0 && < 1.23, + dhall >= 1.15.0 && < 1.24, optparse-applicative < 0.15, text >= 0.11.1.0 && < 1.3 GHC-Options: -Wall diff --git a/dhall-try/dhall-try.cabal b/dhall-try/dhall-try.cabal index c401f34fb..98db1c79c 100644 --- a/dhall-try/dhall-try.cabal +++ b/dhall-try/dhall-try.cabal @@ -16,7 +16,7 @@ executable dhall-try main-is: Main.hs build-depends: base >= 4.11.0.0 && < 5 , aeson-pretty >= 0.8.7 && < 0.9 - , dhall >= 1.19.0 && < 1.23 + , dhall >= 1.19.0 && < 1.24 , dhall-json >= 1.2.5 && < 1.3 , prettyprinter >= 1.2.1 && < 1.3 , text >= 1.2.3.0 && < 1.3 diff --git a/dhall/CHANGELOG.md b/dhall/CHANGELOG.md index c4d5c314a..80b59bacc 100644 --- a/dhall/CHANGELOG.md +++ b/dhall/CHANGELOG.md @@ -1,6 +1,6 @@ -1.22.1 +1.23.0 -* BUG FIX: Fix marshaling union literals +* BREAKING CHANGE: Fix marshaling union literals * 1.22.0 introduced two separate bugs in marshaling union literals between Dhall and Haskell, which this release fixes: * Dhall enums did not correctly map onto Haskell enums diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index ae7f438a4..3775280b5 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -1,5 +1,5 @@ Name: dhall -Version: 1.22.1 +Version: 1.23.0 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 7.10.3, GHC == 8.4.3, GHC == 8.6.1