From e074c5e7d64a9724a4d082066b72ab8b556dc7c4 Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Sat, 14 Jul 2018 08:14:29 -0700 Subject: [PATCH 1/3] =?UTF-8?q?Version=201.5.1=20=E2=86=92=201.5.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++++ README.md | 2 +- dhall.cabal | 2 +- nix/dhall.nix | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94c43b0ca..56a436e7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +1.15.2 + +* Permit `$` in quoted variable names + * See: https://github.com/dhall-lang/dhall-haskell/pull/510 + 1.15.1 * Fix infinite loop when formatting expressions containing `?` diff --git a/README.md b/README.md index 76b6b67fc..fc1f07da3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# `dhall 1.15.1` +# `dhall 1.15.2` `dhall` is a total programming language specialized to configuration files diff --git a/dhall.cabal b/dhall.cabal index 3e5fd1840..ed30438df 100644 --- a/dhall.cabal +++ b/dhall.cabal @@ -1,5 +1,5 @@ Name: dhall -Version: 1.15.1 +Version: 1.15.2 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.0.1 diff --git a/nix/dhall.nix b/nix/dhall.nix index e7fbea626..e0cc60934 100644 --- a/nix/dhall.nix +++ b/nix/dhall.nix @@ -9,7 +9,7 @@ }: mkDerivation { pname = "dhall"; - version = "1.15.1"; + version = "1.15.2"; src = ./..; isLibrary = true; isExecutable = true; From 7b88432004b8137bc0372fa5de258d0a8481d25c Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Sun, 15 Jul 2018 18:23:01 -0700 Subject: [PATCH 2/3] Update version to 1.16.0 --- CHANGELOG.md | 5 ++++- README.md | 2 +- dhall.cabal | 2 +- nix/dhall.nix | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56a436e7d..5ba2cced9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ -1.15.2 +1.16.0 +* BREAKING CHANGE: Add `inputDirFromWith`/`inputExprDirWith` + * This changes `_stack` field of the `Status` type from `[Import]` to + `NonEmpty Import` * Permit `$` in quoted variable names * See: https://github.com/dhall-lang/dhall-haskell/pull/510 diff --git a/README.md b/README.md index fc1f07da3..09fd9a6a4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# `dhall 1.15.2` +# `dhall 1.16.0` `dhall` is a total programming language specialized to configuration files diff --git a/dhall.cabal b/dhall.cabal index ed30438df..dbcc1aef6 100644 --- a/dhall.cabal +++ b/dhall.cabal @@ -1,5 +1,5 @@ Name: dhall -Version: 1.15.2 +Version: 1.16.0 Cabal-Version: >=1.10 Build-Type: Simple Tested-With: GHC == 8.0.1 diff --git a/nix/dhall.nix b/nix/dhall.nix index e0cc60934..cc89c6255 100644 --- a/nix/dhall.nix +++ b/nix/dhall.nix @@ -9,7 +9,7 @@ }: mkDerivation { pname = "dhall"; - version = "1.15.2"; + version = "1.16.0"; src = ./..; isLibrary = true; isExecutable = true; From 5236e4a7a23e6dccf6db1c7a8bcbe2063593bbd4 Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Thu, 19 Jul 2018 19:14:40 -0700 Subject: [PATCH 3/3] Update `CHANGELOG.md` --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ba2cced9..915204bd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ 1.16.0 -* BREAKING CHANGE: Add `inputDirFromWith`/`inputExprDirWith` - * This changes `_stack` field of the `Status` type from `[Import]` to +* BREAKING CHANGE: Consolidate `input` family of functions + * These now take a record of options + * This also `_stack` field of the `Status` type from `[Import]` to `NonEmpty Import` * Permit `$` in quoted variable names * See: https://github.com/dhall-lang/dhall-haskell/pull/510