From 8d03b211ccf92a1a746a17cfc8f61f77f8929d82 Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Thu, 28 Jan 2021 07:17:06 -0800 Subject: [PATCH] =?UTF-8?q?Version=201.37.1=20=E2=86=92=201.38.0=20(#2141)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dhall-bash/dhall-bash.cabal | 4 ++-- dhall-docs/CHANGELOG.md | 5 +++++ dhall-docs/dhall-docs.cabal | 4 ++-- dhall-json/CHANGELOG.md | 4 ++++ dhall-json/dhall-json.cabal | 4 ++-- dhall-lsp-server/dhall-lsp-server.cabal | 4 ++-- dhall-nix/dhall-nix.cabal | 4 ++-- dhall-nixpkgs/dhall-nixpkgs.cabal | 4 ++-- dhall-openapi/dhall-openapi.cabal | 2 +- dhall-yaml/CHANGELOG.md | 4 ++++ dhall-yaml/dhall-yaml.cabal | 4 ++-- dhall/CHANGELOG.md | 21 +++++++++++++++++++++ dhall/dhall-lang | 2 +- dhall/dhall.cabal | 2 +- 14 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dhall-bash/dhall-bash.cabal b/dhall-bash/dhall-bash.cabal index 58bbf39c5..b8a75ceb1 100644 --- a/dhall-bash/dhall-bash.cabal +++ b/dhall-bash/dhall-bash.cabal @@ -1,5 +1,5 @@ Name: dhall-bash -Version: 1.0.35 +Version: 1.0.36 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.38, + dhall >= 1.36.0 && < 1.39, 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 e7368d607..521f4d912 100644 --- a/dhall-docs/CHANGELOG.md +++ b/dhall-docs/CHANGELOG.md @@ -1,3 +1,8 @@ +1.0.4 + +* Build against `dhall-1.38.0`, `tasty-1.4`, `tasty-silver-3.2`, and + `cryptonite-0.28` + 1.0.3 * Build against `dhall-1.37.0` diff --git a/dhall-docs/dhall-docs.cabal b/dhall-docs/dhall-docs.cabal index 7921f974f..e4d5f34fe 100644 --- a/dhall-docs/dhall-docs.cabal +++ b/dhall-docs/dhall-docs.cabal @@ -1,5 +1,5 @@ Name: dhall-docs -Version: 1.0.3 +Version: 1.0.4 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.6.1 @@ -65,7 +65,7 @@ Library containers , cryptonite < 0.29, directory >= 1.3.0.0 && < 1.4 , - dhall >= 1.35.0 && < 1.38, + dhall >= 1.35.0 && < 1.39, 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 7123091a2..40c46cfdf 100644 --- a/dhall-json/CHANGELOG.md +++ b/dhall-json/CHANGELOG.md @@ -1,3 +1,7 @@ +1.7.5 + +* Build against `dhall-1.38.0`, `tasty-1.4`, and `tasty-silver-3.2` + 1.7.4 * Build against `dhall-1.37.0` diff --git a/dhall-json/dhall-json.cabal b/dhall-json/dhall-json.cabal index b861c730d..85a72e720 100644 --- a/dhall-json/dhall-json.cabal +++ b/dhall-json/dhall-json.cabal @@ -1,5 +1,5 @@ Name: dhall-json -Version: 1.7.4 +Version: 1.7.5 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.38, + dhall >= 1.36.0 && < 1.39, 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 1fffc52b1..f095182c4 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.12 +Version: 1.0.13 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.38 + , dhall >= 1.35.0 && < 1.39 , dhall-json >= 1.4 && < 1.8 , filepath >= 1.4.2 && < 1.5 , haskell-lsp >= 0.19.0.0 && < 0.25 diff --git a/dhall-nix/dhall-nix.cabal b/dhall-nix/dhall-nix.cabal index c04180f86..2d893a04d 100644 --- a/dhall-nix/dhall-nix.cabal +++ b/dhall-nix/dhall-nix.cabal @@ -1,5 +1,5 @@ Name: dhall-nix -Version: 1.1.19 +Version: 1.1.20 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.38, + dhall >= 1.36 && < 1.39, hnix >= 0.7 && < 0.13, 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 2814ee296..133a68925 100644 --- a/dhall-nixpkgs/dhall-nixpkgs.cabal +++ b/dhall-nixpkgs/dhall-nixpkgs.cabal @@ -1,4 +1,4 @@ -Version: 1.0.3 +Version: 1.0.4 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.6 , data-fix - , dhall >= 1.32.0 && < 1.38 + , dhall >= 1.32.0 && < 1.39 , foldl < 1.5 , hnix >= 0.10.1 && < 0.13 , lens-family-core >= 1.0.0 && < 2.2 diff --git a/dhall-openapi/dhall-openapi.cabal b/dhall-openapi/dhall-openapi.cabal index eee87080b..dc8c87f62 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.38 , + dhall >= 1.35.0 && < 1.39 , prettyprinter >= 1.7.0 && < 1.8 , scientific >= 0.3.0.0 && < 0.4 , sort >= 1.0 && < 1.1 , diff --git a/dhall-yaml/CHANGELOG.md b/dhall-yaml/CHANGELOG.md index a2fe84532..7d13a2c13 100644 --- a/dhall-yaml/CHANGELOG.md +++ b/dhall-yaml/CHANGELOG.md @@ -1,3 +1,7 @@ +1.2.5 + +* Build against `dhall-1.38.0`, `tasty-1.4`, and `tasty-silver-3.2` + 1.2.4 * Build against `dhall-1.37.0` diff --git a/dhall-yaml/dhall-yaml.cabal b/dhall-yaml/dhall-yaml.cabal index c2b2bdce4..7bb31f2b5 100644 --- a/dhall-yaml/dhall-yaml.cabal +++ b/dhall-yaml/dhall-yaml.cabal @@ -1,5 +1,5 @@ Name: dhall-yaml -Version: 1.2.4 +Version: 1.2.5 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.38, + dhall >= 1.31.0 && < 1.39, 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 9b2498fac..c7d90915f 100644 --- a/dhall/CHANGELOG.md +++ b/dhall/CHANGELOG.md @@ -1,3 +1,24 @@ +1.38.0 + +* [BREAKING CHANGE: Detect preferred character set from input](https://github.com/dhall-lang/dhall-haskell/pull/2108) + * `dhall format` will now preserve the character set of the formatted file + by default. In other words, if the file uses ASCII punctuation then + `dhall format` will format the file using ASCII punctuation. + * If the file contains both ASCII and Unicode punctuation it will prefer + Unicode by default + * This is a breaking change because the `Lam` / `Pi` / `Combine` / + `CombineTypes`, and `Prefer` constructors now take an additional argument + to record which character set was used +* [BUG FIX: Fix CORS compliance check](https://github.com/dhall-lang/dhall-haskell/pull/2121) + * Previous versions were not correctly enforcing CORS compliance + * This implies that some imports that would have worked previously by + accident will now fail; specifically: an import from one domain + transitively importing something from another domain that has not opted + into CORS +* [Add `ToDhall (Fix f)` instance](https://github.com/dhall-lang/dhall-haskell/pull/2122) +* Fixes and improvements to error messages + * [#2130](https://github.com/dhall-lang/dhall-haskell/pull/2130) + 1.37.1 * [Fix performance regression for `with` expressions](https://github.com/dhall-lang/dhall-haskell/pull/2112) diff --git a/dhall/dhall-lang b/dhall/dhall-lang index ccc8bcf65..861038dc9 160000 --- a/dhall/dhall-lang +++ b/dhall/dhall-lang @@ -1 +1 @@ -Subproject commit ccc8bcf65f1309d95c5aff6827b88b9045e63fd3 +Subproject commit 861038dc9cbbd5c9988d57b47783f9ccdbcbf388 diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index 60796e0a9..90dd677aa 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -1,5 +1,5 @@ Name: dhall -Version: 1.37.1 +Version: 1.38.0 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.4.3, GHC == 8.6.1