diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ The [latest version](https://github.com/blockscope/hpack-dhall/blob/master/changelog.md) of this changelog. +## 0.5.4 - Rewrite the README +* Require `hpack >= 0.34.6`. +* Test with GHC `8.8.4`, GHC `8.10.7` and GHC `9.0.1`. + ## 0.5.3 - Rewrite the README * Rewrite the README, making it shorter and splitting some details about more uses and building into separate docs. diff --git a/hpack-dhall.cabal b/hpack-dhall.cabal --- a/hpack-dhall.cabal +++ b/hpack-dhall.cabal @@ -1,11 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.dhall by hpack version 0.34.4. +-- This file has been generated from package.dhall by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack name: hpack-dhall -version: 0.5.3 +version: 0.5.4 synopsis: hpack's dhalling description: Use hpack phrasing in dhall to write cabal files. . @@ -19,15 +19,15 @@ Get the safety of dhall's programmable configuration: typed fields, safe imports and functions. category: Development -homepage: https://github.com/blockscope/hpack-dhall#readme -bug-reports: https://github.com/blockscope/hpack-dhall/issues +homepage: https://github.com/cabalism/hpack-dhall#readme +bug-reports: https://github.com/cabalism/hpack-dhall/issues maintainer: Phil de Joux -copyright: © 2018 Phil de Joux, © 2018 Block Scope Limited +copyright: © 2018 - 2021 Phil de Joux, © 2018 - 2021 Block Scope Limited license: BSD3 license-file: LICENSE build-type: Simple tested-with: - GHC == 8.8.4, GHC == 8.10.4 + GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.1 extra-source-files: package.dhall changelog.md @@ -108,7 +108,7 @@ source-repository head type: git - location: https://github.com/blockscope/hpack-dhall + location: https://github.com/cabalism/hpack-dhall library exposed-modules: @@ -124,11 +124,11 @@ , aeson-pretty , base >=4.13 && <5 , bytestring - , dhall - , dhall-json + , dhall >=1.40.2 + , dhall-json >=1.7.9 , filepath - , hpack >=0.34.4 - , megaparsec + , hpack >=0.34.6 + , megaparsec >=9.2.0 , microlens , prettyprinter , text @@ -153,12 +153,11 @@ , aeson-pretty , base >=4.13 && <5 , bytestring - , dhall - , dhall-json + , dhall >=1.40.2 + , dhall-json >=1.7.9 , filepath - , hpack >=0.34.4 - , hpack-dhall - , megaparsec + , hpack >=0.34.6 + , megaparsec >=9.2.0 , microlens , optparse-applicative , prettyprinter @@ -184,12 +183,11 @@ , aeson-pretty , base >=4.13 && <5 , bytestring - , dhall - , dhall-json + , dhall >=1.40.2 + , dhall-json >=1.7.9 , filepath - , hpack >=0.34.4 - , hpack-dhall - , megaparsec + , hpack >=0.34.6 + , megaparsec >=9.2.0 , microlens , optparse-applicative , prettyprinter @@ -215,12 +213,11 @@ , aeson-pretty , base >=4.13 && <5 , bytestring - , dhall - , dhall-json + , dhall >=1.40.2 + , dhall-json >=1.7.9 , filepath - , hpack >=0.34.4 - , hpack-dhall - , megaparsec + , hpack >=0.34.6 + , megaparsec >=9.2.0 , microlens , optparse-applicative , prettyprinter @@ -246,12 +243,11 @@ , aeson-pretty , base >=4.13 && <5 , bytestring - , dhall - , dhall-json + , dhall >=1.40.2 + , dhall-json >=1.7.9 , filepath - , hpack >=0.34.4 - , hpack-dhall - , megaparsec + , hpack >=0.34.6 + , megaparsec >=9.2.0 , microlens , optparse-applicative , prettyprinter @@ -278,12 +274,12 @@ , aeson-pretty , base , bytestring - , dhall >=1.18.0 - , dhall-json >=1.2.4 + , dhall >=1.40.2 + , dhall-json >=1.7.9 , directory , filepath - , hpack >=0.31.0 - , megaparsec >=7.0.1 + , hpack >=0.34.6 + , megaparsec >=9.2.0 , microlens , prettyprinter , tasty @@ -311,12 +307,12 @@ , aeson-pretty , base >=4.13 && <5 , bytestring - , dhall - , dhall-json + , dhall >=1.40.2 + , dhall-json >=1.7.9 , filepath , hlint - , hpack >=0.34.4 - , megaparsec + , hpack >=0.34.6 + , megaparsec >=9.2.0 , microlens , prettyprinter , text diff --git a/library/Hpack/Dhall.hs b/library/Hpack/Dhall.hs --- a/library/Hpack/Dhall.hs +++ b/library/Hpack/Dhall.hs @@ -3,8 +3,8 @@ {-| Module: Hpack.Dhall Copyright: - © 2018 Phil de Joux - © 2018 Block Scope Limited + © 2018 - 2021 Phil de Joux + © 2018 - 2021 Block Scope Limited License: BSD3 Maintainer: Phil de Joux Stability: experimental @@ -50,8 +50,8 @@ import Dhall.TypeCheck (typeOf) import Dhall.JSON (dhallToJSON) import Dhall.Pretty (prettyExpr, layoutOpts) -import qualified Data.Text.Prettyprint.Doc as PP -import qualified Data.Text.Prettyprint.Doc.Render.Text as PP +import qualified Prettyprinter as PP +import qualified Prettyprinter.Render.Text as PP import qualified Data.Yaml.Pretty as Y import qualified Data.Aeson.Encode.Pretty as A import Hpack.Fields (cmp) diff --git a/package.dhall b/package.dhall --- a/package.dhall +++ b/package.dhall @@ -1,9 +1,9 @@ let deps = [ "base >= 4.13 && < 5" - , "megaparsec" - , "dhall" - , "dhall-json" - , "hpack >= 0.34.4" + , "megaparsec >= 9.2.0" + , "dhall >= 1.40.2" + , "dhall-json >= 1.7.9" + , "hpack >= 0.34.6" , "transformers" , "text" , "microlens" @@ -15,29 +15,21 @@ , "yaml" ] -in let exe-deps = - [ "hpack-dhall", "optparse-applicative" ] - - in { name = - "hpack-dhall" - , version = - "0.5.3" - , maintainer = - "Phil de Joux " +in let exe-deps = [ "optparse-applicative" ] + + in { name = "hpack-dhall" + , version = "0.5.4" + , maintainer = "Phil de Joux " , copyright = - "© 2018 Phil de Joux, © 2018 Block Scope Limited" - , license = - "BSD3" - , license-file = - "LICENSE" - , category = - "Development" - , synopsis = - "hpack's dhalling" + "© 2018 - 2021 Phil de Joux, © 2018 - 2021 Block Scope Limited" + , license = "BSD3" + , license-file = "LICENSE" + , category = "Development" + , synopsis = "hpack's dhalling" , description = '' Use hpack phrasing in dhall to write cabal files. - + There are two main reasons why you'd use hpack-dhall, convenience and safety. Get the convenience of hpack. Don't bother to state what can be inferred or @@ -48,95 +40,76 @@ Get the safety of dhall's programmable configuration: typed fields, safe imports and functions. '' - , github = - "blockscope/hpack-dhall" - , tested-with = - "GHC == 8.8.4, GHC == 8.10.4" + , github = "cabalism/hpack-dhall" + , tested-with = "GHC == 8.8.4, GHC == 8.10.7, GHC == 9.0.1" , extra-source-files = - [ "package.dhall" - , "changelog.md" - , "test-suite-golden/**/*.dhall" - , "test-suite-golden/**/*.dhl" - , "test-suite-golden/**/*.cabal" - , "test-suite-golden/**/*.json" - , "test-suite-golden/**/*.yaml" - , "test-suite-golden/**/*.golden" - ] + [ "package.dhall" + , "changelog.md" + , "test-suite-golden/**/*.dhall" + , "test-suite-golden/**/*.dhl" + , "test-suite-golden/**/*.cabal" + , "test-suite-golden/**/*.json" + , "test-suite-golden/**/*.yaml" + , "test-suite-golden/**/*.golden" + ] , ghc-options = - [ "-Wall" - , "-Wincomplete-uni-patterns" - , "-Wcompat" - , "-Widentities" - , "-Wredundant-constraints" - , "-fhide-source-paths" - ] - , dependencies = - deps - , source-dirs = - "library" - , library = - { exposed-modules = [ "Hpack.Dhall", "Hpack.Fields" ] } + [ "-Wall" + , "-Wincomplete-uni-patterns" + , "-Wcompat" + , "-Widentities" + , "-Wredundant-constraints" + , "-fhide-source-paths" + ] + , dependencies = deps + , source-dirs = "library" + , library.exposed-modules = [ "Hpack.Dhall", "Hpack.Fields" ] , executables = - { dhall-hpack-cabal = - { main = - "CabalMain.hs" - , source-dirs = - [ "exe/options", "exe/dhall-hpack-cabal" ] - , dependencies = - exe-deps - } - , dhall-hpack-json = - { main = - "JsonMain.hs" - , source-dirs = - [ "exe/options", "exe/dhall-hpack-json" ] - , dependencies = - exe-deps - } - , dhall-hpack-yaml = - { main = - "YamlMain.hs" - , source-dirs = - [ "exe/options", "exe/dhall-hpack-yaml" ] - , dependencies = - exe-deps - } - , dhall-hpack-dhall = - { main = - "DhallMain.hs" - , source-dirs = - [ "exe/options", "exe/dhall-hpack-dhall" ] - , dependencies = - exe-deps - } + { dhall-hpack-cabal = + { main = "CabalMain.hs" + , source-dirs = [ "exe/options", "exe/dhall-hpack-cabal" ] + , dependencies = exe-deps } + , dhall-hpack-json = + { main = "JsonMain.hs" + , source-dirs = [ "exe/options", "exe/dhall-hpack-json" ] + , dependencies = exe-deps + } + , dhall-hpack-yaml = + { main = "YamlMain.hs" + , source-dirs = [ "exe/options", "exe/dhall-hpack-yaml" ] + , dependencies = exe-deps + } + , dhall-hpack-dhall = + { main = "DhallMain.hs" + , source-dirs = [ "exe/options", "exe/dhall-hpack-dhall" ] + , dependencies = exe-deps + } + } , tests = ./default-tests.dhall ⫽ { golden = - { main = - "Golden.hs" - , source-dirs = - [ "test-suite-golden/src" ] - , dependencies = - [ "base" - , "Cabal" - , "Diff" - , "dhall" - , "filepath" - , "microlens" - , "prettyprinter" - , "tasty" - , "tasty-golden" - , "text" - , "megaparsec >= 7.0.1" - , "dhall >= 1.18.0" - , "dhall-json >= 1.2.4" - , "hpack >= 0.31.0" - , "transformers" - , "aeson" - , "utf8-string" - , "directory" - ] - } + { main = "Golden.hs" + , source-dirs = [ "test-suite-golden/src" ] + , dependencies = + [ "base" + , "Cabal" + , "Diff" + , "dhall" + , "filepath" + , "microlens" + , "prettyprinter" + , "tasty" + , "tasty-golden" + , "text" + , "megaparsec >= 9.2.0" + , "dhall >= 1.40.2" + , "dhall-json >= 1.7.9" + , "hpack >= 0.34.6" + , "transformers" + , "aeson" + , "utf8-string" + , "directory" + ] + } } } diff --git a/test-suite-golden/test-files/key/empty-inferred/package.yaml.cabal b/test-suite-golden/test-files/key/empty-inferred/package.yaml.cabal --- a/test-suite-golden/test-files/key/empty-inferred/package.yaml.cabal +++ b/test-suite-golden/test-files/key/empty-inferred/package.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-golden/test-files/key/empty-package.yaml.cabal b/test-suite-golden/test-files/key/empty-package.yaml.cabal --- a/test-suite-golden/test-files/key/empty-package.yaml.cabal +++ b/test-suite-golden/test-files/key/empty-package.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from empty-package.yaml by hpack version 0.34.4. +-- This file has been generated from empty-package.yaml by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-golden/test-files/key/import-local/package.yaml.cabal b/test-suite-golden/test-files/key/import-local/package.yaml.cabal --- a/test-suite-golden/test-files/key/import-local/package.yaml.cabal +++ b/test-suite-golden/test-files/key/import-local/package.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-golden/test-files/key/import-relative/package.yaml.cabal b/test-suite-golden/test-files/key/import-relative/package.yaml.cabal --- a/test-suite-golden/test-files/key/import-relative/package.yaml.cabal +++ b/test-suite-golden/test-files/key/import-relative/package.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-golden/test-files/key/when-dependencies.yaml.cabal b/test-suite-golden/test-files/key/when-dependencies.yaml.cabal --- a/test-suite-golden/test-files/key/when-dependencies.yaml.cabal +++ b/test-suite-golden/test-files/key/when-dependencies.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from when-dependencies.yaml by hpack version 0.34.4. +-- This file has been generated from when-dependencies.yaml by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-golden/test-files/real-world/hpack/hpack.yaml.cabal b/test-suite-golden/test-files/real-world/hpack/hpack.yaml.cabal --- a/test-suite-golden/test-files/real-world/hpack/hpack.yaml.cabal +++ b/test-suite-golden/test-files/real-world/hpack/hpack.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from hpack.yaml by hpack version 0.34.4. +-- This file has been generated from hpack.yaml by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack diff --git a/test-suite-golden/test-files/real-world/stack/stack.cabal b/test-suite-golden/test-files/real-world/stack/stack.cabal --- a/test-suite-golden/test-files/real-world/stack/stack.cabal +++ b/test-suite-golden/test-files/real-world/stack/stack.cabal @@ -1,10 +1,10 @@ cabal-version: 2.0 --- This file has been generated from stack.dhall by hpack version 0.31.1. +-- This file has been generated from stack.dhall by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack -- --- hash: 33d90e3e81d97f3c404a9e20246cf4aa6942dc054db675cadd50b1edd68582ce +-- hash: bfcbd657ff704d7cafe4abe83a8f7bf038b7009b840ff4a688a4ee05fbafd000 name: stack version: 1.10.0 @@ -421,6 +421,8 @@ main-is: IntegrationSpec.hs other-modules: Paths_stack + autogen-modules: + Paths_stack hs-source-dirs: test/integration test/integration/lib @@ -526,6 +528,8 @@ type: exitcode-stdio-1.0 main-is: Spec.hs other-modules: + Paths_stack + autogen-modules: Paths_stack hs-source-dirs: src/test diff --git a/test-suite-golden/test-files/real-world/stack/stack.cabal.golden b/test-suite-golden/test-files/real-world/stack/stack.cabal.golden --- a/test-suite-golden/test-files/real-world/stack/stack.cabal.golden +++ b/test-suite-golden/test-files/real-world/stack/stack.cabal.golden @@ -1,10 +1,10 @@ cabal-version: 2.0 --- This file has been generated from stack.dhall by hpack version 0.31.1. +-- This file has been generated from stack.dhall by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack -- --- hash: 33d90e3e81d97f3c404a9e20246cf4aa6942dc054db675cadd50b1edd68582ce +-- hash: bfcbd657ff704d7cafe4abe83a8f7bf038b7009b840ff4a688a4ee05fbafd000 name: stack version: 1.10.0 @@ -421,6 +421,8 @@ main-is: IntegrationSpec.hs other-modules: Paths_stack + autogen-modules: + Paths_stack hs-source-dirs: test/integration test/integration/lib @@ -526,6 +528,8 @@ type: exitcode-stdio-1.0 main-is: Spec.hs other-modules: + Paths_stack + autogen-modules: Paths_stack hs-source-dirs: src/test diff --git a/test-suite-golden/test-files/real-world/stack/stack.yaml.cabal b/test-suite-golden/test-files/real-world/stack/stack.yaml.cabal --- a/test-suite-golden/test-files/real-world/stack/stack.yaml.cabal +++ b/test-suite-golden/test-files/real-world/stack/stack.yaml.cabal @@ -1,6 +1,6 @@ cabal-version: 2.0 --- This file has been generated from stack.yaml by hpack version 0.34.4. +-- This file has been generated from stack.yaml by hpack version 0.34.6. -- -- see: https://github.com/sol/hpack @@ -419,6 +419,8 @@ main-is: IntegrationSpec.hs other-modules: Paths_stack + autogen-modules: + Paths_stack hs-source-dirs: test/integration test/integration/lib @@ -524,6 +526,8 @@ type: exitcode-stdio-1.0 main-is: Spec.hs other-modules: + Paths_stack + autogen-modules: Paths_stack hs-source-dirs: src/test