Skip to content

Version 1.36.0 → 1.37.0 #2110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 7, 2020
Merged

Version 1.36.0 → 1.37.0 #2110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ef10b7
Version 1.36.0 → 1.37.0
Gabriella439 Dec 4, 2020
07fe969
Fix `dhall.cabal`
Gabriella439 Dec 5, 2020
279b65d
Bump version for `dhall-bash`
Gabriella439 Dec 5, 2020
ff03388
Merge branch 'master' into gabriel/1.37.0
Gabriella439 Dec 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dhall-bash/dhall-bash.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions dhall-docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions dhall-docs/dhall-docs.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 ,
Expand Down
4 changes: 4 additions & 0 deletions dhall-json/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions dhall-json/dhall-json.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 ,
Expand Down
4 changes: 2 additions & 2 deletions dhall-lsp-server/dhall-lsp-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions dhall-nix/dhall-nix.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 ,
Expand Down
4 changes: 2 additions & 2 deletions dhall-nixpkgs/dhall-nixpkgs.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dhall-openapi/dhall-openapi.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ,
Expand Down
4 changes: 4 additions & 0 deletions dhall-yaml/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions dhall-yaml/dhall-yaml.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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 ,
Expand Down
27 changes: 27 additions & 0 deletions dhall/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion dhall/dhall-lang
Open in desktop
Submodule dhall-lang updated 36 files
+101 −0 CHANGELOG.md
+2 −2 Prelude/JSON/package.dhall
+1 −1 Prelude/JSON/render
+1 −1 Prelude/JSON/render.dhall
+1 −1 Prelude/JSON/renderAs
+37 −2 Prelude/JSON/renderAs.dhall
+1 −1 Prelude/JSON/renderYAML
+1 −1 Prelude/JSON/renderYAML.dhall
+1 −1 Prelude/XML/package.dhall
+1 −1 Prelude/XML/render
+70 −2 Prelude/XML/render.dhall
+2 −2 Prelude/package.dhall
+1 −0 docs/howtos/How-to-integrate-Dhall.md
+0 −57 nixops/0001-schema-Builds-use-jobset_id-instead-of-jobset-name-m.patch
+0 −7 nixops/README.md
+0 −5 nixops/dhallLangNixpkgs.nix
+20 −21 nixops/index.html
+50 −49 nixops/logical.nix
+4 −9 nixops/nixpkgs.nix
+2 −2 nixops/physical.nix
+9 −13 release.nix
+12 −144 standard/README.md
+1 −0 standard/Shift.lhs
+1 −0 standard/Substitution.lhs
+1 −0 standard/Syntax.lhs
+1 −1 standard/multiline.md
+1 −0 standard/shell.nix
+317 −9 standard/shift.md
+21 −0 standard/standard.cabal
+335 −15 standard/substitution.md
+363 −0 standard/syntax.md
+1 −1 standard/versioning.md
+0 −0 tests/type-inference/success/unit/IfBranchesKindA.dhall
+1 −0 tests/type-inference/success/unit/IfBranchesKindB.dhall
+0 −0 tests/type-inference/success/unit/IfBranchesTypeA.dhall
+1 −0 tests/type-inference/success/unit/IfBranchesTypeB.dhall
4 changes: 3 additions & 1 deletion dhall/dhall.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down