diff --git a/dhall-bash/dhall-bash.cabal b/dhall-bash/dhall-bash.cabal index 468ea248c..58bbf39c5 100644 --- a/dhall-bash/dhall-bash.cabal +++ b/dhall-bash/dhall-bash.cabal @@ -1,5 +1,5 @@ Name: dhall-bash -Version: 1.0.34 +Version: 1.0.35 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.4.3, GHC == 8.6.1 @@ -31,7 +31,7 @@ Library base >= 4.11.0.0 && < 5 , bytestring < 0.11, containers < 0.7 , - dhall >= 1.36.0 && < 1.37, + dhall >= 1.36.0 && < 1.38, neat-interpolation < 0.6 , shell-escape < 0.3 , text >= 0.2 && < 1.3 diff --git a/dhall-docs/CHANGELOG.md b/dhall-docs/CHANGELOG.md index 160fc87d1..e7368d607 100644 --- a/dhall-docs/CHANGELOG.md +++ b/dhall-docs/CHANGELOG.md @@ -1,3 +1,7 @@ +1.0.3 + +* Build against `dhall-1.37.0` + 1.0.2 * [Fix command-line completions for files](https://github.com/dhall-lang/dhall-haskell/pull/2034) diff --git a/dhall-docs/dhall-docs.cabal b/dhall-docs/dhall-docs.cabal index 59e678ece..a1a3d3913 100644 --- a/dhall-docs/dhall-docs.cabal +++ b/dhall-docs/dhall-docs.cabal @@ -1,5 +1,5 @@ Name: dhall-docs -Version: 1.0.2 +Version: 1.0.3 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.6.1 @@ -65,7 +65,7 @@ Library containers , cryptonite < 0.28, directory >= 1.3.0.0 && < 1.4 , - dhall >= 1.35.0 && < 1.37, + dhall >= 1.35.0 && < 1.38, file-embed >= 0.0.10.0 , filepath >= 1.4 && < 1.5 , lens-family-core >= 1.0.0 && < 2.2 , diff --git a/dhall-json/CHANGELOG.md b/dhall-json/CHANGELOG.md index 73fb155c4..7123091a2 100644 --- a/dhall-json/CHANGELOG.md +++ b/dhall-json/CHANGELOG.md @@ -1,3 +1,7 @@ +1.7.4 + +* Build against `dhall-1.37.0` + 1.7.3 * [Fix command-line completions for files](https://github.com/dhall-lang/dhall-haskell/pull/2034) diff --git a/dhall-json/dhall-json.cabal b/dhall-json/dhall-json.cabal index 0244478d4..692b1945b 100644 --- a/dhall-json/dhall-json.cabal +++ b/dhall-json/dhall-json.cabal @@ -1,5 +1,5 @@ Name: dhall-json -Version: 1.7.3 +Version: 1.7.4 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.4.3, GHC == 8.6.1 @@ -44,7 +44,7 @@ Library aeson-yaml >= 1.1.0 && < 1.2 , bytestring < 0.11, containers >= 0.5.9 && < 0.7 , - dhall >= 1.36.0 && < 1.37, + dhall >= 1.36.0 && < 1.38, exceptions >= 0.8.3 && < 0.11, filepath < 1.5 , lens-family-core >= 1.0.0 && < 2.2 , diff --git a/dhall-lsp-server/dhall-lsp-server.cabal b/dhall-lsp-server/dhall-lsp-server.cabal index 38fc72df0..38ed52cce 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.11 +Version: 1.0.12 cabal-version: 1.12 synopsis: Language Server Protocol (LSP) server for Dhall homepage: https://github.com/dhall-lang/dhall-haskell/tree/master/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.35.0 && < 1.37 + , dhall >= 1.35.0 && < 1.38 , dhall-json >= 1.4 && < 1.8 , filepath >= 1.4.2 && < 1.5 , haskell-lsp >= 0.19.0.0 && < 0.24 diff --git a/dhall-nix/dhall-nix.cabal b/dhall-nix/dhall-nix.cabal index b9eb05842..33a88d0a9 100644 --- a/dhall-nix/dhall-nix.cabal +++ b/dhall-nix/dhall-nix.cabal @@ -1,5 +1,5 @@ Name: dhall-nix -Version: 1.1.18 +Version: 1.1.19 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.0.1 @@ -30,7 +30,7 @@ Library base >= 4.11.0.0 && < 5 , containers < 0.7 , data-fix < 0.4 , - dhall >= 1.36 && < 1.37, + dhall >= 1.36 && < 1.38, hnix >= 0.7 && < 0.12, lens-family-core >= 1.0.0 && < 2.2 , neat-interpolation < 0.6 , diff --git a/dhall-nixpkgs/dhall-nixpkgs.cabal b/dhall-nixpkgs/dhall-nixpkgs.cabal index 0641fecc7..ad0d10b29 100644 --- a/dhall-nixpkgs/dhall-nixpkgs.cabal +++ b/dhall-nixpkgs/dhall-nixpkgs.cabal @@ -1,4 +1,4 @@ -Version: 1.0.2 +Version: 1.0.3 Cabal-Version: >=1.10 Name: dhall-nixpkgs Synopsis: Convert Dhall projects to Nix packages @@ -19,7 +19,7 @@ Executable dhall-to-nixpkgs Build-Depends: base >= 4.11 && < 5 , aeson >= 1.0.0.0 && < 1.5 , data-fix - , dhall >= 1.32.0 && < 1.37 + , dhall >= 1.32.0 && < 1.38 , foldl < 1.5 , hnix >= 0.10.1 && < 0.12 , lens-family-core >= 1.0.0 && < 2.2 diff --git a/dhall-openapi/dhall-openapi.cabal b/dhall-openapi/dhall-openapi.cabal index 025ba8519..504a70fda 100644 --- a/dhall-openapi/dhall-openapi.cabal +++ b/dhall-openapi/dhall-openapi.cabal @@ -49,7 +49,7 @@ library base >= 4.11.0.0 && < 5 , aeson >= 1.0.0.0 && < 1.6 , containers >= 0.5.8.0 && < 0.7 , - dhall >= 1.35.0 && < 1.37 , + dhall >= 1.35.0 && < 1.38 , prettyprinter >= 1.7.0 && < 1.8 , sort >= 1.0 && < 1.1 , text >= 0.11.1.0 && < 1.3 , diff --git a/dhall-yaml/CHANGELOG.md b/dhall-yaml/CHANGELOG.md index 01d4ba968..a2fe84532 100644 --- a/dhall-yaml/CHANGELOG.md +++ b/dhall-yaml/CHANGELOG.md @@ -1,3 +1,7 @@ +1.2.4 + +* Build against `dhall-1.37.0` + 1.2.3 * [Fix command-line completions for files](https://github.com/dhall-lang/dhall-haskell/pull/2034) diff --git a/dhall-yaml/dhall-yaml.cabal b/dhall-yaml/dhall-yaml.cabal index 1e0d80163..997c31b9f 100644 --- a/dhall-yaml/dhall-yaml.cabal +++ b/dhall-yaml/dhall-yaml.cabal @@ -1,5 +1,5 @@ Name: dhall-yaml -Version: 1.2.3 +Version: 1.2.4 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.4.3, GHC == 8.6.1 @@ -37,7 +37,7 @@ Library base >= 4.11.0.0 && < 5 , aeson >= 1.0.0.0 && < 1.6 , bytestring < 0.11, - dhall >= 1.31.0 && < 1.37, + dhall >= 1.31.0 && < 1.38, dhall-json >= 1.6.0 && < 1.8 , optparse-applicative >= 0.14.0.0 && < 0.17, text >= 0.11.1.0 && < 1.3 , diff --git a/dhall/CHANGELOG.md b/dhall/CHANGELOG.md index 1fb16b040..809117c0a 100644 --- a/dhall/CHANGELOG.md +++ b/dhall/CHANGELOG.md @@ -1,3 +1,30 @@ +1.37.0 + +* [Supports version 20.0.0 of the standard](https://github.com/dhall-lang/dhall-lang/releases/tag/v20.0.0) + * [Implement revised `Text/replace` β-normalization](https://github.com/dhall-lang/dhall-haskell/pull/2072) + * [Allow `Text/replace ""` to support an abstract haystack](https://github.com/dhall-lang/dhall-haskell/pull/2084) + * [Support `if` expressions returning a type or kind](https://github.com/dhall-lang/dhall-haskell/pull/2080) +* BREAKING CHANGE TO THE API: [Improve error message for duplicate projection label](https://github.com/dhall-lang/dhall-haskell/pull/2097) + * This also makes the implementation more standards-compliant, by treating + a duplicate label as a type error instead of a parse error + * This is a breaking change since the `Project` constructor now stores a + `[Text]` instead of `Set Text` +* [Add `--cache` flag to `dhall hash`](https://github.com/dhall-lang/dhall-haskell/pull/2093) + * This flag adds the hashed expression to the cache when enabled +* [Deprecate `Inject` / `Interpret`](https://github.com/dhall-lang/dhall-haskell/pull/2099) + * You should instead use `ToDhall` / `FromDhall`, respectively +* Fixes and improvements to the haddocks: + * [#2098](https://github.com/dhall-lang/dhall-haskell/pull/2098) + * [#2100](https://github.com/dhall-lang/dhall-haskell/pull/2100) +* Fixes and improvements to error messages: + * [#2082](https://github.com/dhall-lang/dhall-haskell/pull/2082) + * [#2095](https://github.com/dhall-lang/dhall-haskell/pull/2095) +* Fixes and improvements to the parser: + * [#2083](https://github.com/dhall-lang/dhall-haskell/pull/2089) +* Fixes and improvements to the pretty printer: + * [#2083](https://github.com/dhall-lang/dhall-haskell/pull/2083) + * [#2101](https://github.com/dhall-lang/dhall-haskell/pull/2101) + 1.36.0 * [Supports version 19.0.0 of the standard](https://github.com/dhall-lang/dhall-lang/releases/tag/v19.0.0) diff --git a/dhall/dhall-lang b/dhall/dhall-lang index 8e0674eb4..ccc8bcf65 160000 --- a/dhall/dhall-lang +++ b/dhall/dhall-lang @@ -1 +1 @@ -Subproject commit 8e0674eb419876e81d9e2218ddefc503a85fd580 +Subproject commit ccc8bcf65f1309d95c5aff6827b88b9045e63fd3 diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index b7fd10807..0014d0e9c 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -1,5 +1,5 @@ Name: dhall -Version: 1.36.0 +Version: 1.37.0 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.4.3, GHC == 8.6.1 @@ -85,6 +85,7 @@ Extra-Source-Files: dhall-lang/Prelude/JSON/package.dhall dhall-lang/Prelude/JSON/render dhall-lang/Prelude/JSON/renderAs + dhall-lang/Prelude/JSON/renderCompact.dhall dhall-lang/Prelude/JSON/renderInteger.dhall dhall-lang/Prelude/JSON/renderYAML dhall-lang/Prelude/JSON/string @@ -182,6 +183,7 @@ Extra-Source-Files: dhall-lang/Prelude/Text/default dhall-lang/Prelude/Text/defaultMap dhall-lang/Prelude/Text/package.dhall + dhall-lang/Prelude/Text/replace.dhall dhall-lang/Prelude/Text/replicate dhall-lang/Prelude/Text/show dhall-lang/Prelude/Text/spaces