diff --git a/.travis-functions.sh b/.travis-functions.sh index 2085b4e..4aafc2c 100644 --- a/.travis-functions.sh +++ b/.travis-functions.sh @@ -1,3 +1,3 @@ -get_cabal_version() { cat $1/$1.cabal | grep '^Version: ' | sed -e 's/^Version: //g'; } +get_cabal_version() { cat $1/$1.cabal | grep '^Version: ' | sed -e 's/^Version: *//g'; } mk_release_name() { echo "$1-$(get_cabal_version $1)-x86_64-macos.tar.bz2"; } diff --git a/dhall-bash/dhall-bash.cabal b/dhall-bash/dhall-bash.cabal index 7262f1a..7714a3f 100644 --- a/dhall-bash/dhall-bash.cabal +++ b/dhall-bash/dhall-bash.cabal @@ -1,5 +1,5 @@ Name: dhall-bash -Version: 1.0.24 +Version: 1.0.25 Cabal-Version: >=1.8.0.2 Build-Type: Simple Tested-With: GHC == 7.10.3, 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.27.0 && < 1.28, + dhall >= 1.28.0 && < 1.29, neat-interpolation < 0.4 , shell-escape < 0.3 , text >= 0.2 && < 1.3 diff --git a/dhall-json/CHANGELOG.md b/dhall-json/CHANGELOG.md index f90ad81..a81ffe9 100644 --- a/dhall-json/CHANGELOG.md +++ b/dhall-json/CHANGELOG.md @@ -1,10 +1,33 @@ -Next version +1.6.0 +* BREAKING CHANGE: [Move `HsYAML` code to a new `dhall-yaml` package](https://github.com/dhall-lang/dhall-haskell/pull/1514) + * This package is now fully BSD-licensed (both for the JSON and YAML + utilities) + * The GPL-licensed YAML utilities are now provided as part of the + `dhall-yaml` package + * Note that this package still provides `dhall-to-yaml` and the `dhall-yaml` + package provides a separate `dhall-to-yaml-ng` executable + * This is a breaking change in the following respects: + * The YAML-related modules in this package were renamed + * This package no longer accepts a `-fgpl` cabal configure flag + * This package no longer provides the `yaml-to-dhall` executable (which + now resides within the `dhall-yaml` package) * [BREAKING CHANGE: Rename some options of `dhall-to-{json,yaml}` to more consistent ones](https://github.com/dhall-lang/dhall-haskell/issues/1430): * rename `--omitEmpty` to `--omit-empty` * rename `--preserveNull` to `--preserve-null` * rename `--noMaps` to `--no-maps` * drop `--omitNull` as redundant because of `--preserve-null` (see below) +* [BUG FIX: Handle empty maps correctly](https://github.com/dhall-lang/dhall-haskell/pull/1561) + * `dhall-to-{json,yaml}` now correctly translate empty Dhall maps + to empty JSON dictionaries +* [Add `Dhall.JSON.defaultConversion`](https://github.com/dhall-lang/dhall-haskell/pull/1579) +* [Don't normalize schema before type-checking](https://github.com/dhall-lang/dhall-haskell/pull/1555) + * This improves the error messages for `{json,yaml}-to-dhall` +* [Fix `dhall-to-yaml` to quote special strings](https://github.com/dhall-lang/dhall-haskell/pull/1474) +* [Make some of CLI options for `dhall-json` more consistent](https://github.com/dhall-lang/dhall-haskell/pull/1475) + +1.5.0 + * [BREAKING CHANGE: Enable `--pretty` by default for `dhall-to-json`](https://github.com/dhall-lang/dhall-haskell/issues/716) * [BREAKING CHANGE: Enable `--omitNull` by default for `dhall-to-{json,yaml}`](https://github.com/dhall-lang/dhall-haskell/pull/1365) * To recover the old behavior use the `--preserveNull` flag diff --git a/dhall-json/dhall-json.cabal b/dhall-json/dhall-json.cabal index ad9ba23..c790da2 100644 --- a/dhall-json/dhall-json.cabal +++ b/dhall-json/dhall-json.cabal @@ -1,5 +1,5 @@ Name: dhall-json -Version: 1.5.0 +Version: 1.6.0 Cabal-Version: >=1.8.0.2 Build-Type: Simple Tested-With: GHC == 7.10.3, GHC == 8.4.3, GHC == 8.6.1 @@ -40,7 +40,7 @@ Library aeson-yaml >= 1.0.5 && < 1.1 , bytestring < 0.11, containers , - dhall >= 1.27.0 && < 1.28, + dhall >= 1.28.0 && < 1.29, 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 65265f9..25c0ceb 100644 --- a/dhall-lsp-server/dhall-lsp-server.cabal +++ b/dhall-lsp-server/dhall-lsp-server.cabal @@ -1,6 +1,6 @@ -cabal-version: 1.12 name: dhall-lsp-server -Version: 1.0.2 +Version: 1.0.3 +cabal-version: 1.12 synopsis: Language Server Protocol (LSP) server for Dhall homepage: https://github.com/dhall-lang/dhall-haskell/dhall-lsp-server#readme bug-reports: https://github.com/dhall-lang/dhall-haskell/issues @@ -50,8 +50,8 @@ 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.27.0 && < 1.28 - , dhall-json >= 1.4 && < 1.6 + , dhall >= 1.28.0 && < 1.29 + , dhall-json >= 1.4 && < 1.7 , filepath >= 1.4.2 && < 1.5 , haskell-lsp >= 0.15.0.0 && < 0.17 , rope-utf16-splay >= 0.3.1.0 && < 0.4 diff --git a/dhall-nix/dhall-nix.cabal b/dhall-nix/dhall-nix.cabal index 789d42b..b27993e 100644 --- a/dhall-nix/dhall-nix.cabal +++ b/dhall-nix/dhall-nix.cabal @@ -1,5 +1,5 @@ Name: dhall-nix -Version: 1.1.9 +Version: 1.1.10 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.27 && < 1.28, + dhall >= 1.28 && < 1.29, hnix >= 0.6.1 && < 0.7 , neat-interpolation < 0.4 , text >= 0.8.0.0 && < 1.3 diff --git a/dhall-try/dhall-try.cabal b/dhall-try/dhall-try.cabal index 7e6dfa8..dc3a053 100644 --- a/dhall-try/dhall-try.cabal +++ b/dhall-try/dhall-try.cabal @@ -16,8 +16,8 @@ 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.28 - , dhall-json >= 1.2.5 && < 1.6 + , dhall >= 1.19.0 && < 1.29 + , dhall-json >= 1.2.5 && < 1.7 , prettyprinter >= 1.5.1 && < 1.6 , text >= 1.2.3.0 && < 1.3 , ghcjs-base >= 0.2.0.0 && < 0.3 diff --git a/dhall-yaml/CHANGELOG.md b/dhall-yaml/CHANGELOG.md index e69de29..e28a22f 100644 --- a/dhall-yaml/CHANGELOG.md +++ b/dhall-yaml/CHANGELOG.md @@ -0,0 +1,3 @@ +1.0.0 + +* Initial release diff --git a/dhall-yaml/dhall-yaml.cabal b/dhall-yaml/dhall-yaml.cabal index 31997d5..5fb1846 100644 --- a/dhall-yaml/dhall-yaml.cabal +++ b/dhall-yaml/dhall-yaml.cabal @@ -1,5 +1,5 @@ Name: dhall-yaml -Version: 1.6.0 +Version: 1.0.0 Cabal-Version: >=1.8.0.2 Build-Type: Simple Tested-With: GHC == 7.10.3, GHC == 8.4.3, GHC == 8.6.1 @@ -37,8 +37,8 @@ Library base >= 4.8.0.0 && < 5 , aeson >= 1.0.0.0 && < 1.5 , bytestring < 0.11, - dhall >= 1.27.0 && < 1.28, - dhall-json >= 1.5.0 && < 1.6 , + dhall >= 1.28.0 && < 1.29, + dhall-json >= 1.6.0 && < 1.7 , optparse-applicative >= 0.14.0.0 && < 0.16, text >= 0.11.1.0 && < 1.3 , vector diff --git a/dhall/CHANGELOG.md b/dhall/CHANGELOG.md index f97511c..8e157e6 100644 --- a/dhall/CHANGELOG.md +++ b/dhall/CHANGELOG.md @@ -1,3 +1,89 @@ +1.28.0 + +* [Supports version 12.0.0 of the standard](https://github.com/dhall-lang/dhall-lang/releases/tag/v12.0.0) +* BREAKING CHANGE: [Add `Integer/{clamp,negate}` built-ins](https://github.com/dhall-lang/dhall-haskell/pull/1486) + * This is a technically breaking change API since this adds a new + constructor to the `Expr` type + * This is also a technically breaking change to the language. See the [changelog for standard version 12.0.0](https://github.com/dhall-lang/dhall-lang/releases/tag/v12.0.0) for more details +* BREAKING CHANGE: [Remove support for fusion](https://github.com/dhall-lang/dhall-haskell/pull/1478) + * This is also a technically breaking change to the language. See the [changelog for standard version 12.0.0](https://github.com/dhall-lang/dhall-lang/releases/tag/v12.0.0) for more details +* BREAKING CHANGE: [Parse whitespace more precisely](https://github.com/dhall-lang/dhall-haskell/pull/1483) + * The Haskell implementation now matches the official grammar much more + closely, but as a result will now reject some programs that it used to + accept + * For example, `1:Natural` used to be valid and now is no longer valid as + the standard requires mandatory whitespace after the `:` + * Consult the [standard grammar](https://github.com/dhall-lang/dhall-lang/blob/master/standard/dhall.abnf) if you run into a new parsing error as a result of this change + * This is also a parsing performance regression (specifically for parsing + comments), but should not be noticeable in practice. See [#1512](https://github.com/dhall-lang/dhall-haskell/pull/1512) for more details +* BREAKING CHANGE: Rename `Type` to `Decoder` and `InputType` to `Encoder` [#1483](https://github.com/dhall-lang/dhall-haskell/pull/1485) / [#1489](https://github.com/dhall-lang/dhall-haskell/pull/1489) +* BUG FIX: [Fix `dhall format --check`](https://github.com/dhall-lang/dhall-haskell/pull/1462) + * Before this change `dhall format --check` would fail due to attempting to + read all of standard input in twice +* BUG FIX: [Fix `dhall freeze` to always re-freeze an import](https://github.com/dhall-lang/dhall-haskell/pull/1471) + * Before this fix, `dhall freeze` would not attempt to refreeze an already + frozen import +* [Permit spaces around completion operator](https://github.com/dhall-lang/dhall-haskell/pull/1532) + * See the [changelog for standard version 12.0.0](https://github.com/dhall-lang/dhall-lang/releases/tag/v12.0.0) for more details +* [Make `missing` referentially transparent](https://github.com/dhall-lang/dhall-haskell/pull/1509) + * `missing` can now be imported transitively via a remote import + * Normally resolving `missing` would still still fail, except for + `missing as Location`, which is now a valid transitive import + * See the [changelog for standard version 12.0.0](https://github.com/dhall-lang/dhall-lang/releases/tag/v12.0.0) for more details +* [Write cache files atomically](https://github.com/dhall-lang/dhall-haskell/pull/1544) + * This is a resilience improvement so that the cache is not left in a + corrupt state in the event of a power outage or exhausting disk/memory +* [New `Dhall.function` utility](https://github.com/dhall-lang/dhall-haskell/pull/1507) + * This is provides the same functionality as the `Interpret` instance for + `(->)`, except without the use of typeclasses +* [New `dhall haskell-syntax-tree` command](https://github.com/dhall-lang/dhall-haskell/pull/1553) + * This command displays the Haskell syntax tree of an expression + (primarily for debugging purposes) + * Note that this is highly-volatile and subject to change, so don't depend + on this programmatically. We may break the output of this command without + any notice. +* [Add `instance Show Ann`](https://github.com/dhall-lang/dhall-haskell/pull/1567) +* [Move normalization code from `Dhall.Core` to `Dhall.Normalize`](https://github.com/dhall-lang/dhall-haskell/pull/1452) + * Note that this is not a breaking change. The relocated utilities are + still re-exported from `Dhall.Core` +* [Fix `dhall resolve --transitive-dependencies` to list dependencies in "post-order"](https://github.com/dhall-lang/dhall-haskell/pull/1539) +* Performance improvements + * [#1500](https://github.com/dhall-lang/dhall-haskell/pull/1500) + * [#1522](https://github.com/dhall-lang/dhall-haskell/pull/1522) + * [#1568](https://github.com/dhall-lang/dhall-haskell/pull/1568) + * [#1580](https://github.com/dhall-lang/dhall-haskell/pull/1578) +* Fixes and improvements to code formatting + * [#1460](https://github.com/dhall-lang/dhall-haskell/pull/1460) + * [#1466](https://github.com/dhall-lang/dhall-haskell/pull/1466) + * [#1508](https://github.com/dhall-lang/dhall-haskell/pull/1508) + * [#1527](https://github.com/dhall-lang/dhall-haskell/pull/1527) + * [#1422](https://github.com/dhall-lang/dhall-haskell/pull/1422) + * [#1552](https://github.com/dhall-lang/dhall-haskell/pull/1552) + * [#1543](https://github.com/dhall-lang/dhall-haskell/pull/1543) + * [#1554](https://github.com/dhall-lang/dhall-haskell/pull/1554) + * [#1569](https://github.com/dhall-lang/dhall-haskell/pull/1569) +* Fixes and improvements to code linting + * [#1518](https://github.com/dhall-lang/dhall-haskell/pull/1518) + * [#1531](https://github.com/dhall-lang/dhall-haskell/pull/1531) +* Fixes and improvements to error messages + * [#1443](https://github.com/dhall-lang/dhall-haskell/pull/1443) + * [#1448](https://github.com/dhall-lang/dhall-haskell/pull/1448) + * [#1482](https://github.com/dhall-lang/dhall-haskell/pull/1482) + * [#1519](https://github.com/dhall-lang/dhall-haskell/pull/1519) + * [#1556](https://github.com/dhall-lang/dhall-haskell/pull/1556) + * [#1528](https://github.com/dhall-lang/dhall-haskell/pull/1528) +* Fixes and improvements to the parser + * [#1473](https://github.com/dhall-lang/dhall-haskell/pull/1473) + * [#1549](https://github.com/dhall-lang/dhall-haskell/pull/1549) + * [#1563](https://github.com/dhall-lang/dhall-haskell/pull/1563) + * [#1584](https://github.com/dhall-lang/dhall-haskell/pull/1584) +* Fixes and improvements to diffs + * [#1585](https://github.com/dhall-lang/dhall-haskell/pull/1585) +* Fixes and improvements to the REPL + * [#1573](https://github.com/dhall-lang/dhall-haskell/pull/1573) +* Fixes and improvements to documentation + * [#1530](https://github.com/dhall-lang/dhall-haskell/pull/1530) + 1.27.0 * [Supports version 11.0.0 of the standard](https://github.com/dhall-lang/dhall-lang/releases/tag/v11.0.0) diff --git a/dhall/dhall-lang b/dhall/dhall-lang index c277af1..9f24813 160000 --- a/dhall/dhall-lang +++ b/dhall/dhall-lang @@ -1 +1 @@ -Subproject commit c277af172f97eb06fe0bccd99d68f24029fd86be +Subproject commit 9f248138f69ee5e22192dc3d0417d5c77b189e04 diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index be3be4b..91c3c7a 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -1,5 +1,5 @@ Name: dhall -Version: 1.27.0 +Version: 1.28.0 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 7.10.3, GHC == 8.4.3, GHC == 8.6.1