diff --git a/dhall-bash/dhall-bash.cabal b/dhall-bash/dhall-bash.cabal index b0d505e2c..52b133580 100644 --- a/dhall-bash/dhall-bash.cabal +++ b/dhall-bash/dhall-bash.cabal @@ -1,5 +1,5 @@ Name: dhall-bash -Version: 1.0.28 +Version: 1.0.29 Cabal-Version: >=1.8.0.2 Build-Type: Simple Tested-With: GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.1 @@ -31,7 +31,7 @@ Library base >= 4.8.0.0 && < 5 , bytestring < 0.11, containers < 0.7 , - dhall >= 1.28.0 && < 1.31, + dhall >= 1.31.0 && < 1.32, neat-interpolation < 0.5 , shell-escape < 0.3 , text >= 0.2 && < 1.3 diff --git a/dhall-json/CHANGELOG.md b/dhall-json/CHANGELOG.md index 09dd8b10a..3e6c2db92 100644 --- a/dhall-json/CHANGELOG.md +++ b/dhall-json/CHANGELOG.md @@ -1,3 +1,7 @@ +1.6.3 + +* [yaml: Single-quote date/bool string fields](https://github.com/dhall-lang/dhall-haskell/commits/master/dhall-json) + 1.6.2 * [Fix `dhall-json` for new `Prelude.JSON.Type`](https://github.com/dhall-lang/dhall-haskell/pull/1631) diff --git a/dhall-json/dhall-json.cabal b/dhall-json/dhall-json.cabal index 357653653..0dfba70ed 100644 --- a/dhall-json/dhall-json.cabal +++ b/dhall-json/dhall-json.cabal @@ -1,5 +1,5 @@ Name: dhall-json -Version: 1.6.2 +Version: 1.6.3 Cabal-Version: >=1.8.0.2 Build-Type: Simple Tested-With: GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.1 @@ -40,7 +40,7 @@ Library aeson-yaml >= 1.0.6 && < 1.1 , bytestring < 0.11, containers , - dhall >= 1.30.0 && < 1.31, + dhall >= 1.31.0 && < 1.32, exceptions >= 0.8.3 && < 0.11, filepath < 1.5 , optparse-applicative >= 0.14.0.0 && < 0.16, diff --git a/dhall-lsp-server/dhall-lsp-server.cabal b/dhall-lsp-server/dhall-lsp-server.cabal index bf2d1e028..731f0692e 100644 --- a/dhall-lsp-server/dhall-lsp-server.cabal +++ b/dhall-lsp-server/dhall-lsp-server.cabal @@ -1,5 +1,5 @@ name: dhall-lsp-server -Version: 1.0.5 +Version: 1.0.6 cabal-version: 1.12 synopsis: Language Server Protocol (LSP) server for Dhall homepage: https://github.com/dhall-lang/dhall-haskell/dhall-lsp-server#readme @@ -50,7 +50,7 @@ library , containers >= 0.5.11.0 && < 0.7 , data-default >= 0.7.1.1 && < 0.8 , directory >= 1.2.2.0 && < 1.4 - , dhall >= 1.29.0 && < 1.31 + , dhall >= 1.29.0 && < 1.32 , dhall-json >= 1.4 && < 1.7 , filepath >= 1.4.2 && < 1.5 , haskell-lsp >= 0.19.0.0 && < 0.21 diff --git a/dhall-nix/dhall-nix.cabal b/dhall-nix/dhall-nix.cabal index 18ec35db3..092960ea8 100644 --- a/dhall-nix/dhall-nix.cabal +++ b/dhall-nix/dhall-nix.cabal @@ -1,5 +1,5 @@ Name: dhall-nix -Version: 1.1.12 +Version: 1.1.13 Cabal-Version: >=1.8.0.2 Build-Type: Simple Tested-With: GHC == 8.0.1 @@ -30,7 +30,7 @@ Library base >= 4.8.0.0 && < 5 , containers < 0.7 , data-fix < 0.3 , - dhall >= 1.28 && < 1.31, + dhall >= 1.31 && < 1.32, hnix >= 0.7 && < 0.8 , neat-interpolation < 0.5 , text >= 0.8.0.0 && < 1.3 diff --git a/dhall-try/dhall-try.cabal b/dhall-try/dhall-try.cabal index 0a2b3241f..ae348346b 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.31 + , dhall >= 1.19.0 && < 1.32 , dhall-json >= 1.2.5 && < 1.7 , prettyprinter >= 1.5.1 && < 1.7 , text >= 1.2.3.0 && < 1.3 diff --git a/dhall-yaml/CHANGELOG.md b/dhall-yaml/CHANGELOG.md index e28a22fbd..987405cfb 100644 --- a/dhall-yaml/CHANGELOG.md +++ b/dhall-yaml/CHANGELOG.md @@ -1,3 +1,15 @@ +1.0.3 + +* [yaml: Single-quote date/bool string fields](https://github.com/dhall-lang/dhall-haskell/commits/master/dhall-json) + +1.0.2 + +* Build against `dhall-1.30.0` + +1.0.1 + +* Build against `dhall-1.29.0` + 1.0.0 * Initial release diff --git a/dhall-yaml/dhall-yaml.cabal b/dhall-yaml/dhall-yaml.cabal index df357c0fa..8bd98d0c4 100644 --- a/dhall-yaml/dhall-yaml.cabal +++ b/dhall-yaml/dhall-yaml.cabal @@ -1,5 +1,5 @@ Name: dhall-yaml -Version: 1.0.2 +Version: 1.0.3 Cabal-Version: >=1.8.0.2 Build-Type: Simple Tested-With: GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.1 @@ -37,7 +37,7 @@ Library base >= 4.8.0.0 && < 5 , aeson >= 1.0.0.0 && < 1.5 , bytestring < 0.11, - dhall >= 1.28.0 && < 1.31, + dhall >= 1.31.0 && < 1.32, dhall-json >= 1.6.0 && < 1.7 , optparse-applicative >= 0.14.0.0 && < 0.16, text >= 0.11.1.0 && < 1.3 , diff --git a/dhall/CHANGELOG.md b/dhall/CHANGELOG.md index 00df8abf7..c639de6ac 100644 --- a/dhall/CHANGELOG.md +++ b/dhall/CHANGELOG.md @@ -1,3 +1,65 @@ +1.31.0 + +* [Supports version 15.0.0 of the standard](https://github.com/dhall-lang/dhall-lang/releases/tag/v15.0.0) + * [Implement `with` keyword](https://github.com/dhall-lang/dhall-haskell/pull/1685) + * You can now write `someRecord with a.b.c = x` to update a nested + fields + * [Add support for record puns](https://github.com/dhall-lang/dhall-haskell/pull/1710) + * You can now write `{ x, y }` as a shorthand for `{ x = x, y = y }` +* BREAKING CHANGE TO THE API: [Auto-derive `Generic`/`FromDhall`/`ToDhall` with Template Haskell](https://github.com/dhall-lang/dhall-haskell/pull/1682) + * Now the `Dhall.TH.makeHaskell*` utilities will include these derived + instances in the generated declarations + * This is a breaking change since users were likely already generating these + instances separately, which will now conflict with the included instances +* BREAKING CHANGE TO THE API: [`From/ToDhall` no longer takes `InterpretOptions` argument](https://github.com/dhall-lang/dhall-haskell/pull/1696) + * The types of the `autoWith` and `injectWith` methods have changed to + take an `InputNormalizer` instead of an `InterpretOptions` + * Note that `InputNormalizer` is a subset of `InterpretOptions` + * This is a breaking change to how derived `FromDhall` / `ToDhall` instances + are customized to more closely match how other Haskell packages customize + derived instances (e.g. `aeson` with `FromJSON` / `ToJSON`) + * Previously you would customize the behavior globally by passing in + a top-level `InterpretOptions` record to `autoWith` + * Now you can customize the behavior locally on a per-instance basis + * This change enables the following change ... +* [Add `Dhall.Deriving` module for `deriving-via` helpers](https://github.com/dhall-lang/dhall-haskell/pull/1700) + * Now you can take advantage of the `-XDerivingVia` language extension to + customize derived `FromDhall`/`ToDhall` instances, like this: + * `deriving (FromDhall, ToDhall) via Codec (SetSingletonConstructors Bare) Name` +* BREAKING CHANGE TO THE LANGUAGE: [Match standard with respect to `using toMap`](https://github.com/dhall-lang/dhall-haskell/pull/1673) + * `https://example.com using toMap customHeaders` is now a parse error + and needs to be explicitly parenthesized as + `https://example.com using (toMap customHeaders)` + * The language standard had always required the parentheses, but the Haskell + implementation was not correctly matching the standard +* [Fix formatting of indented comments containing empty lines](https://github.com/dhall-lang/dhall-haskell/pull/1688) + * `dhall format` was previously not idempotent when formatting indented + comments with empty lines + * Specifically, the formatter kept indenting things further with each + format, which this change fixes +* [Fix pretty-printer to preserve original numeric literals](https://github.com/dhall-lang/dhall-haskell/pull/1674) + * Now `dhall format` will preserve numeric literals exactly how you wrote + them + * For example, `0xFF` will no longer be reformatted as `255` +* [Add `dhall to-directory-tree` support for `Map`s](https://github.com/dhall-lang/dhall-haskell/pull/1705) + * `Map`s are now converted to directories (just like records) +* [Add manpage](https://github.com/dhall-lang/dhall-haskell/pull/1677) + * ... mainly for the benefit of people packaging Dhall for various + distributions +* [Group commands in CLI](https://github.com/dhall-lang/dhall-haskell/pull/1692) + * The command-line `--help` output now groups commands into useful + sections +* [Fix numeric parsing for GHCJS](https://github.com/dhall-lang/dhall-haskell/pull/1681) + * The GHCJS backend for Dhall was failing to parse numbers, which this + change fixes +* Fixes and improvements to error messages: + * [#1656](https://github.com/dhall-lang/dhall-haskell/pull/1656) + * [#1698](https://github.com/dhall-lang/dhall-haskell/pull/1698) + * [#1702](https://github.com/dhall-lang/dhall-haskell/pull/1702) +* Fixes and improvements to the haddocks: + * [#1708](https://github.com/dhall-lang/dhall-haskell/pull/1708) + * [#1712](https://github.com/dhall-lang/dhall-haskell/pull/1712) + 1.30.0 * [Supports version 14.0.0 of the standard](https://github.com/dhall-lang/dhall-lang/releases/tag/v14.0.0) diff --git a/dhall/dhall-lang b/dhall/dhall-lang index 99d84e47e..91d88e0a7 160000 --- a/dhall/dhall-lang +++ b/dhall/dhall-lang @@ -1 +1 @@ -Subproject commit 99d84e47ed9c64cee9c48212ca8f2af9320cdda6 +Subproject commit 91d88e0a7938387cd8eb3cfaf091bd79d312168f diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index 4a69603a8..216e50f31 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -1,5 +1,5 @@ Name: dhall -Version: 1.30.0 +Version: 1.31.0 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.2.2, GHC == 8.4.3, GHC == 8.6.1 @@ -61,6 +61,7 @@ Extra-Source-Files: dhall-lang/Prelude/Integer/subtract dhall-lang/Prelude/Integer/toDouble dhall-lang/Prelude/Integer/toNatural + dhall-lang/Prelude/JSON/Format dhall-lang/Prelude/JSON/Nesting dhall-lang/Prelude/JSON/Tagged dhall-lang/Prelude/JSON/Type @@ -78,6 +79,7 @@ Extra-Source-Files: dhall-lang/Prelude/JSON/omitNullFields dhall-lang/Prelude/JSON/package.dhall dhall-lang/Prelude/JSON/render + dhall-lang/Prelude/JSON/renderAs dhall-lang/Prelude/JSON/renderInteger.dhall dhall-lang/Prelude/JSON/renderYAML dhall-lang/Prelude/JSON/string