Merge branch 'main' into fix_nested_HOT

dhall-lang · Nov 23, 2023 · 3f03637 · 3f03637
2 parents 299e4ee + cd60fc2
commit 3f03637
Show file tree

Hide file tree

Showing 42 changed files with 817 additions and 471 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,7 +31,7 @@ jobs:
           submodules: true
       - id: setup-haskell-cabal
         name: "Setup Haskell environment"
-        uses: haskell/actions/setup@v1.2.1
+        uses: haskell/actions/setup@v2.4.6
         with:
           enable-stack: true
       - name: "Cache"

diff --git a/dhall-bash/dhall-bash.cabal b/dhall-bash/dhall-bash.cabal
@@ -1,5 +1,5 @@
 Name: dhall-bash
-Version: 1.0.40
+Version: 1.0.41
 Cabal-Version: >=1.10
 Build-Type: Simple
 License: BSD3
@@ -28,12 +28,12 @@ Library
     Hs-Source-Dirs: src
     Build-Depends:
         base                      >= 4.11.0.0 && < 5   ,
-        bytestring                               < 0.12,
+        bytestring                               < 0.13,
         containers                               < 0.7 ,
-        dhall                     >= 1.41.0   && < 1.42,
+        dhall                     >= 1.42.0   && < 1.43,
         neat-interpolation                       < 0.6 ,
         shell-escape                             < 0.3 ,
-        text                      >= 0.2      && < 2.1
+        text                      >= 0.2      && < 2.2
     Exposed-Modules: Dhall.Bash
     GHC-Options: -Wall
     Default-Language: Haskell2010
@@ -48,7 +48,7 @@ Executable dhall-to-bash
         bytestring                            ,
         dhall                                 ,
         dhall-bash                            ,
-        optparse-generic >= 1.1.1    && < 1.5 ,
+        optparse-generic >= 1.1.1    && < 1.6 ,
         text
     GHC-Options: -Wall
     Default-Language: Haskell2010
diff --git a/dhall-csv/CHANGELOG.md b/dhall-csv/CHANGELOG.md
@@ -1,3 +1,7 @@
+1.0.4
+
+* Build against `dhall-1.42.0`
+
 1.0.3
 
 * Builds against newer dependencies

diff --git a/dhall-csv/dhall-csv.cabal b/dhall-csv/dhall-csv.cabal
@@ -1,5 +1,5 @@
 Name: dhall-csv
-Version: 1.0.3
+Version: 1.0.4
 Cabal-Version: >=1.10
 Build-Type: Simple
 License: BSD3
@@ -38,7 +38,7 @@ Library
         containers           >= 0.5.9     && < 0.7 ,
         either                                     ,
         exceptions           >= 0.8.3     && < 0.11,
-        dhall                >= 1.39.0    && < 1.42,
+        dhall                >= 1.39.0    && < 1.43,
         filepath                             < 1.5 ,
         optparse-applicative                       ,
         prettyprinter        >= 1.7.0     && < 1.8 ,

diff --git a/dhall-docs/CHANGELOG.md b/dhall-docs/CHANGELOG.md
@@ -1,3 +1,9 @@
+1.0.11
+
+* Build against `dhall-1.42`
+* [Build against `turtle-1.6`](https://github.com/dhall-lang/dhall-haskell/pull/2465)
+* [Build against `transformers-0.6` and `mtl-2.3`](https://github.com/dhall-lang/dhall-haskell/pull/2471)
+
 1.0.10
 
 * [Index non-`.dhall` files](https://github.com/dhall-lang/dhall-haskell/pull/2407)

diff --git a/dhall-docs/dhall-docs.cabal b/dhall-docs/dhall-docs.cabal
@@ -1,5 +1,5 @@
 Name: dhall-docs
-Version: 1.0.10
+Version: 1.0.11
 Cabal-Version: >=1.10
 Build-Type: Simple
 License: BSD3
@@ -69,7 +69,7 @@ Library
         containers                                 ,
         cryptohash-sha256                          ,
         directory            >= 1.3.0.0   && < 1.4 ,
-        dhall                >= 1.38.0    && < 1.42,
+        dhall                >= 1.38.0    && < 1.43,
         file-embed           >= 0.0.10.0           ,
         filepath             >= 1.4       && < 1.5 ,
         lens-family-core     >= 1.0.0     && < 2.2 ,
@@ -84,7 +84,7 @@ Library
         text                 >= 0.11.1.0  && < 2.1 ,
         transformers         >= 0.2.0.0   && < 0.7 ,
         mtl                  >= 2.2.1     && < 2.4 ,
-        optparse-applicative >= 0.14.0.0  && < 0.18
+        optparse-applicative >= 0.14.0.0  && < 0.19
     Exposed-Modules:
         Dhall.Docs
         Dhall.Docs.Core

diff --git a/dhall-docs/src/Dhall/Docs/Core.hs b/dhall-docs/src/Dhall/Docs/Core.hs
@@ -44,6 +44,7 @@ import Dhall.Docs.Embedded
 import Dhall.Docs.Html
 import Dhall.Docs.Markdown
 import Dhall.Docs.Store
+import Dhall.Docs.Util            (fileAnIssue)
 import Dhall.Parser
     ( Header (..)
     , ParseError (..)
@@ -439,26 +440,6 @@ addHtmlExt :: Path Rel File -> Path Rel File
 addHtmlExt relFile =
     Data.Maybe.fromMaybe (fileAnIssue "addHtmlExt") $ Path.addExtension ".html" relFile
 
--- | If you're wondering the GitHub query params for issue creation:
--- https://docs.github.com/en/github/managing-your-work-on-github/about-automation-for-issues-and-pull-requests-with-query-parameters
-fileAnIssue :: Text -> a
-fileAnIssue titleName =
-    error $ "\ESC[1;31mError\ESC[0m Documentation generator bug\n\n" <>
-
-            "Explanation: This error message means that there is a bug in the " <>
-            "Dhall Documentation generator. You didn't did anything wrong, but " <>
-            "if you would like to see this problem fixed then you should report " <>
-            "the bug at:\n\n" <>
-
-            "https://github.com/dhall-lang/dhall-haskell/issues/new?labels=dhall-docs,bug\n\n" <>
-
-            "explaining your issue and add \"" <> Data.Text.unpack titleName <> "\" as error code " <>
-            "so we can find the proper location in the source code where the error happened\n\n" <>
-
-            "Please, also include your package in the issue. It can be in:\n\n" <>
-            "* A compressed archive (zip, tar, etc)\n" <>
-            "* A git repository, preferably with a commit reference"
-
 {-| Generate all of the docs for a package. This function does all the `IO ()`
     related tasks to call `generateDocsPure`
 -}

diff --git a/dhall-docs/src/Dhall/Docs/Util.hs b/dhall-docs/src/Dhall/Docs/Util.hs
@@ -12,7 +12,7 @@ fileAnIssue titleName =
     error $ "\ESC[1;31mError\ESC[0m Documentation generator bug\n\n" <>
 
             "Explanation: This error message means that there is a bug in the " <>
-            "Dhall Documentation generator. You didn't did anything wrong, but " <>
+            "Dhall Documentation generator. You didn't do anything wrong, but " <>
             "if you would like to see this problem fixed then you should report " <>
             "the bug at:\n\n" <>
 

diff --git a/dhall-json/CHANGELOG.md b/dhall-json/CHANGELOG.md
@@ -1,3 +1,7 @@
+1.7.12
+
+* Build against `dhall-1.42`
+
 1.7.11
 
 * [Add new `--preserve-header` option](https://github.com/dhall-lang/dhall-haskell/pull/2433)

diff --git a/dhall-json/dhall-json.cabal b/dhall-json/dhall-json.cabal
@@ -1,5 +1,5 @@
 Name: dhall-json
-Version: 1.7.11
+Version: 1.7.12
 Cabal-Version: >=1.10
 Build-Type: Simple
 License: BSD3
@@ -43,11 +43,11 @@ Library
         aeson-yaml                >= 1.1.0     && < 1.2 ,
         bytestring                                < 0.12,
         containers                >= 0.5.9     && < 0.7 ,
-        dhall                     >= 1.41.0    && < 1.42,
+        dhall                     >= 1.42.0    && < 1.43,
         exceptions                >= 0.8.3     && < 0.11,
         filepath                                  < 1.5 ,
         lens-family-core          >= 1.0.0     && < 2.2 ,
-        optparse-applicative      >= 0.14.0.0  && < 0.18,
+        optparse-applicative      >= 0.14.0.0  && < 0.19,
         prettyprinter             >= 1.7.0     && < 1.8 ,
         scientific                >= 0.3.0.0   && < 0.4 ,
         text                      >= 0.11.1.0  && < 2.1 ,
@@ -98,7 +98,7 @@ Executable json-to-dhall
     Build-Depends:
         base                                             ,
         aeson                                            ,
-        ansi-terminal               >= 0.6.3.1  && < 0.12,
+        ansi-terminal               >= 0.6.3.1  && < 1.1 ,
         bytestring                                       ,
         dhall                                            ,
         dhall-json                                       ,

diff --git 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.1.2
+Version:        1.1.3
 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
@@ -49,13 +49,13 @@ 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.38.0   && < 1.42
+    , dhall                >= 1.38.0   && < 1.43
     , dhall-json           >= 1.4      && < 1.8
     , filepath             >= 1.4.2    && < 1.5
     , lsp                  >= 1.2.0.0  && < 1.5
     , rope-utf16-splay     >= 0.3.1.0  && < 0.5
     , hslogger             >= 1.2.10   && < 1.4
-    , lens                 >= 4.16.1   && < 5.2
+    , lens                 >= 4.16.1   && < 5.3
     -- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469
     , megaparsec           >= 7.0.2    && < 10
     , mtl                  >= 2.2.2    && < 2.3

diff --git a/dhall-nix/dhall-nix.cabal b/dhall-nix/dhall-nix.cabal
@@ -1,5 +1,5 @@
 Name: dhall-nix
-Version: 1.1.25
+Version: 1.1.26
 Cabal-Version: >=1.10
 Build-Type: Simple
 License: BSD3
@@ -29,7 +29,7 @@ Library
         base                      >= 4.11.0.0 && < 5   ,
         containers                               < 0.7 ,
         data-fix                                 < 0.4 ,
-        dhall                     >= 1.41     && < 1.42,
+        dhall                     >= 1.42     && < 1.43,
         hnix                      >= 0.16     && < 0.17,
         lens-family-core          >= 1.0.0    && < 2.2 ,
         neat-interpolation                       < 0.6 ,
@@ -40,7 +40,7 @@ Library
     Default-Language: Haskell2010
     if os(windows)
         Buildable: False
-        
+
 Executable dhall-to-nix
     if os(windows)
         Buildable: False
@@ -53,7 +53,7 @@ Executable dhall-to-nix
         dhall                               ,
         dhall-nix                           ,
         hnix                                ,
-        optparse-generic >= 1.1.1   && < 1.5,
+        optparse-generic >= 1.1.1   && < 1.6,
         text
     GHC-Options: -Wall
     Default-Language: Haskell2010

diff --git a/dhall-nixpkgs/dhall-nixpkgs.cabal b/dhall-nixpkgs/dhall-nixpkgs.cabal
@@ -1,4 +1,4 @@
-Version:             1.0.9
+Version:             1.0.10
 Cabal-Version:       >=1.10
 Name:                dhall-nixpkgs
 Synopsis:            Convert Dhall projects to Nix packages
@@ -22,15 +22,15 @@ Executable dhall-to-nixpkgs
                      , base64-bytestring    >= 1.1.0.0
                      , bytestring                          < 0.12
                      , data-fix
-                     , dhall                >= 1.32.0   && < 1.42
+                     , dhall                >= 1.42.0   && < 1.43
                      , foldl                               < 1.5
                      , hnix                 >= 0.10.1   && < 0.17
                      , lens-family-core     >= 1.0.0    && < 2.2
                      -- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469
                      , megaparsec           >= 7.0.0    && < 10
                      , mmorph                              < 1.3
                      , neat-interpolation                  < 0.6
-                     , optparse-applicative >= 0.14.0.0 && < 0.18
+                     , optparse-applicative >= 0.14.0.0 && < 0.19
                      , prettyprinter        >= 1.7.0    && < 1.8
                      , text                 >= 0.11.1.0 && < 2.1
                      , transformers         >= 0.2.0.0  && < 0.6

diff --git a/dhall-openapi/dhall-openapi.cabal b/dhall-openapi/dhall-openapi.cabal
@@ -1,6 +1,6 @@
 Cabal-Version:  1.11
 Name:           dhall-openapi
-Version:        1.0.5
+Version:        1.0.6
 Homepage:       https://github.com/dhall-lang/dhall-haskell/tree/master/dhall-openapi#dhall-openapi
 Author:         Fabrizio Ferrai
 Maintainer:     [email protected]
@@ -45,8 +45,8 @@ Executable openapi-to-dhall
     filepath                >= 1.4       && < 1.5  ,
     -- megaparsec follows SemVer: https://github.com/mrkkrp/megaparsec/issues/469#issuecomment-927918469
     megaparsec              >= 7.0       && < 10   ,
-    optparse-applicative    >= 0.14.3.0  && < 0.18 ,
-    parser-combinators                             , 
+    optparse-applicative    >= 0.14.3.0  && < 0.19 ,
+    parser-combinators                             ,
     prettyprinter                                  ,
     sort                                           ,
     text                                           ,
@@ -79,7 +79,7 @@ Library
     base                    >= 4.11.0.0  && < 5    ,
     aeson                   >= 1.0.0.0   && < 2.2  ,
     containers              >= 0.5.8.0   && < 0.7  ,
-    dhall                   >= 1.38.0    && < 1.42 ,
+    dhall                   >= 1.38.0    && < 1.43 ,
     prettyprinter           >= 1.7.0     && < 1.8  ,
     scientific              >= 0.3.0.0   && < 0.4  ,
     sort                    >= 1.0       && < 1.1  ,

diff --git a/dhall-toml/CHANGELOG.md b/dhall-toml/CHANGELOG.md
@@ -1,3 +1,7 @@
+1.0.3
+
+* [Support `Integer`s](https://github.com/dhall-lang/dhall-haskell/pull/2469)
+
 1.0.2
 
 * [Improve command-line interface](https://github.com/dhall-lang/dhall-haskell/pull/2355)

diff --git a/dhall-toml/dhall-toml.cabal b/dhall-toml/dhall-toml.cabal
@@ -1,5 +1,5 @@
 Name:               dhall-toml
-Version:            1.0.2
+Version:            1.0.3
 Cabal-Version:      >=1.10
 Build-Type:         Simple
 License:            BSD3
@@ -35,13 +35,13 @@ Library
     Hs-Source-Dirs:   src
     Build-Depends:
         base                 >= 4.12     && < 5    ,
-        dhall                >= 1.39.0   && < 1.42 ,
+        dhall                >= 1.39.0   && < 1.43 ,
         tomland              >= 1.3.2.0  && < 1.4  ,
         text                 >= 0.11.1.0 && < 2.1  ,
         containers           >= 0.5.9    && < 0.7  ,
         unordered-containers >= 0.2      && < 0.3  ,
         prettyprinter        >= 1.7.0    && < 1.8  ,
-        optparse-applicative >= 0.14     && < 0.18
+        optparse-applicative >= 0.14     && < 0.19
     Exposed-Modules:
         Dhall.DhallToToml
         Dhall.TomlToDhall