From 58c94970497c9109dd2a4813142c2139a5b3d669 Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Fri, 22 Jun 2018 17:13:33 -0700 Subject: [PATCH 1/3] =?UTF-8?q?Version=201.14.0=20=E2=86=92=201.15.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 42 +++++++++++++++++++++++++++++++++++++----- README.md | 2 +- dhall.cabal | 2 +- nix/dhall.nix | 31 ++++++++++++++----------------- 4 files changed, 53 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 128c681f5..c5c5ce40c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,43 @@ 1.15.0 -* BREAKING CHANGE TO THE API: Removed the `Parent` constructor from `FilePrefix`. +* BREAKING CHANGE TO THE API: Use strict `Text` instead of lazy `Text` + * See: https://github.com/dhall-lang/dhall-haskell/pull/455 +* BREAKING CHANGE TO THE API: Remove `Buildable` in favor of `Pretty` + * See: https://github.com/dhall-lang/dhall-haskell/pull/459 +* BREAKING CHANGE TO THE API: Removed the `Parent` constructor from `FilePrefix` * Instead, use `Here` with a `".."` prefix. - -* Added `inputFrom` and `inputFromWith`, which allow naming the file - that the expression is coming from. This improves error messages but - has no change to the semantics. + * See: https://github.com/dhall-lang/dhall-haskell/pull/407 +* BUG FIX: Disallow duplicate fields in records + * See: https://github.com/dhall-lang/dhall-haskell/pull/430 +* BUG FIX: Fix stripping of leading whitespace in multi-line strings + * See: https://github.com/dhall-lang/dhall-haskell/pull/469 +* BUG FIX: Fix formatting field access of an import + * See: https://github.com/dhall-lang/dhall-haskell/pull/471 +* Add `Integer/toDouble` built-in function + * See: https://github.com/dhall-lang/dhall-haskell/pull/434 +* Add `dhall diff` command + * See: https://github.com/dhall-lang/dhall-haskell/pull/442 +* Change `dhall-repl`/`dhall-hash`/`dhall-format` to `dhall` subcommands + * i.e. `dhall repl`/`dhall hash`/`dhall format` + * See: https://github.com/dhall-lang/dhall-haskell/pull/435 + * See: https://github.com/dhall-lang/dhall-haskell/pull/452 +* Added `inputFrom` and `inputFromWith` + * These allow naming the file that the expression is coming from for better + error messages + * See: https://github.com/dhall-lang/dhall-haskell/pull/464 +* Performance improvements + * See: https://github.com/dhall-lang/dhall-haskell/pull/420 +* Tutorial recommends GitHub for Prelude instead of IPFS + * See: https://github.com/dhall-lang/dhall-haskell/pull/479 +* Pretty-print expressions in type errors + * See: https://github.com/dhall-lang/dhall-haskell/pull/429 +* Formatting improvements + * See: https://github.com/dhall-lang/dhall-haskell/pull/398 + * See: https://github.com/dhall-lang/dhall-haskell/pull/458 +* Diff improvements + * See: https://github.com/dhall-lang/dhall-haskell/pull/455 + * See: https://github.com/dhall-lang/dhall-haskell/pull/470 + * See: https://github.com/dhall-lang/dhall-haskell/pull/478 1.14.0 diff --git a/README.md b/README.md index 711788140..5a8372309 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# `dhall 1.14.0` +# `dhall 1.15.0` `dhall` is a total programming language specialized to configuration files diff --git a/dhall.cabal b/dhall.cabal index 116a036f6..5357af9a2 100644 --- a/dhall.cabal +++ b/dhall.cabal @@ -1,5 +1,5 @@ Name: dhall -Version: 1.14.0 +Version: 1.15.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 b3d347137..69a3420f9 100644 --- a/nix/dhall.nix +++ b/nix/dhall.nix @@ -1,33 +1,30 @@ { mkDerivation, ansi-terminal, base, bytestring, case-insensitive , containers, contravariant, criterion, cryptonite, deepseq, Diff -, directory, doctest, exceptions, filepath, formatting, haskeline -, http-client, http-client-tls, insert-ordered-containers -, lens-family-core, megaparsec, memory, mtl, optparse-applicative -, parsers, prettyprinter, prettyprinter-ansi-terminal, repline -, scientific, stdenv, tasty, tasty-hunit, template-haskell, text -, transformers, unordered-containers, vector +, directory, doctest, exceptions, filepath, haskeline, http-client +, http-client-tls, insert-ordered-containers, lens-family-core +, megaparsec, memory, mtl, optparse-applicative, parsers +, prettyprinter, prettyprinter-ansi-terminal, repline, scientific +, stdenv, tasty, tasty-hunit, template-haskell, text, transformers +, unordered-containers, vector }: mkDerivation { pname = "dhall"; - version = "1.14.0"; + version = "1.15.0"; src = ./..; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base bytestring case-insensitive containers - contravariant cryptonite Diff directory exceptions filepath formatting - http-client http-client-tls insert-ordered-containers - lens-family-core megaparsec memory optparse-applicative parsers - prettyprinter prettyprinter-ansi-terminal scientific + contravariant cryptonite Diff directory exceptions filepath + haskeline http-client http-client-tls insert-ordered-containers + lens-family-core megaparsec memory mtl optparse-applicative parsers + prettyprinter prettyprinter-ansi-terminal repline scientific template-haskell text transformers unordered-containers vector ]; - executableHaskellDepends = [ - ansi-terminal base haskeline megaparsec mtl optparse-applicative - prettyprinter prettyprinter-ansi-terminal repline text - ]; + executableHaskellDepends = [ base ]; testHaskellDepends = [ - base deepseq doctest insert-ordered-containers prettyprinter tasty - tasty-hunit text vector + base deepseq Diff doctest insert-ordered-containers prettyprinter + tasty tasty-hunit text vector ]; benchmarkHaskellDepends = [ base containers criterion directory text From b344722d1f425957f1272b7a2bd9e633047a7e30 Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Thu, 28 Jun 2018 07:19:21 -0700 Subject: [PATCH 2/3] Update `CHANGELOG.md` --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5c5ce40c..fbf74c1ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,12 +15,18 @@ * See: https://github.com/dhall-lang/dhall-haskell/pull/471 * Add `Integer/toDouble` built-in function * See: https://github.com/dhall-lang/dhall-haskell/pull/434 +* Add `dhall freeze` command + * See: https://github.com/dhall-lang/dhall-haskell/pull/486 * Add `dhall diff` command * See: https://github.com/dhall-lang/dhall-haskell/pull/442 +* Add `dhall lint` command + * See: https://github.com/dhall-lang/dhall-haskell/pull/484 * Change `dhall-repl`/`dhall-hash`/`dhall-format` to `dhall` subcommands * i.e. `dhall repl`/`dhall hash`/`dhall format` * See: https://github.com/dhall-lang/dhall-haskell/pull/435 * See: https://github.com/dhall-lang/dhall-haskell/pull/452 +* Add `with-http` cabal flag to disable support for remote imports + * See: https://github.com/dhall-lang/dhall-haskell/pull/482 * Added `inputFrom` and `inputFromWith` * These allow naming the file that the expression is coming from for better error messages From d8f3106729d8d8155d315d06757df1654994119b Mon Sep 17 00:00:00 2001 From: Gabriel Gonzalez Date: Thu, 28 Jun 2018 09:36:38 -0700 Subject: [PATCH 3/3] Update `CHANGELOG.md` --- CHANGELOG.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbf74c1ef..fd8330d7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ 1.15.0 +* BREAKING CHANGE TO THE API: Support alternative imports using new `?` operator + * This adds a new constructor which affects exhaustive pattern matches + * See: https://github.com/dhall-lang/dhall-haskell/pull/473 +* BREAKING CHANGE TO THE API: Add `Integer/toDouble` built-in function + * This adds a new constructor which affects exhaustive pattern matches + * See: https://github.com/dhall-lang/dhall-haskell/pull/434 * BREAKING CHANGE TO THE API: Use strict `Text` instead of lazy `Text` * See: https://github.com/dhall-lang/dhall-haskell/pull/455 * BREAKING CHANGE TO THE API: Remove `Buildable` in favor of `Pretty` @@ -13,8 +19,6 @@ * See: https://github.com/dhall-lang/dhall-haskell/pull/469 * BUG FIX: Fix formatting field access of an import * See: https://github.com/dhall-lang/dhall-haskell/pull/471 -* Add `Integer/toDouble` built-in function - * See: https://github.com/dhall-lang/dhall-haskell/pull/434 * Add `dhall freeze` command * See: https://github.com/dhall-lang/dhall-haskell/pull/486 * Add `dhall diff` command