From 3a2b4dc05c25aff37b658e1cc840bbe20e364783 Mon Sep 17 00:00:00 2001 From: Mann mit Hut Date: Wed, 5 Jun 2024 14:16:31 +0200 Subject: [PATCH] Require turtle >=1.6 --- dhall-docs/dhall-docs.cabal | 2 +- dhall-nixpkgs/dhall-nixpkgs.cabal | 2 +- dhall/dhall.cabal | 2 +- stack.ghc-8.10.yaml | 4 ++++ stack.ghc-9.2.yaml | 5 ++++- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dhall-docs/dhall-docs.cabal b/dhall-docs/dhall-docs.cabal index bc0223c52..21667169f 100644 --- a/dhall-docs/dhall-docs.cabal +++ b/dhall-docs/dhall-docs.cabal @@ -152,7 +152,7 @@ Test-Suite tasty tasty < 1.5 , tasty-silver < 3.4 , tasty-hunit >= 0.10 && < 0.11, - turtle < 1.7 , + turtle >= 1.6 && < 1.7 , text GHC-Options: -Wall Default-Language: Haskell2010 diff --git a/dhall-nixpkgs/dhall-nixpkgs.cabal b/dhall-nixpkgs/dhall-nixpkgs.cabal index 9075f40e5..6afaf5335 100644 --- a/dhall-nixpkgs/dhall-nixpkgs.cabal +++ b/dhall-nixpkgs/dhall-nixpkgs.cabal @@ -34,7 +34,7 @@ Executable dhall-to-nixpkgs , prettyprinter >= 1.7.0 && < 1.8 , text >= 0.11.1.0 && < 2.1 , transformers >= 0.2.0.0 && < 0.6 - , turtle < 1.6 + , turtle >= 1.6 && < 1.7 , network-uri < 2.8 Default-Language: Haskell2010 GHC-Options: -Wall -threaded diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index bb05ffe02..5de5b2c77 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -452,7 +452,7 @@ Test-Suite tasty tasty-quickcheck >= 0.9.2 && < 0.11, tasty-silver < 3.4 , temporary >= 1.2.1 && < 1.4 , - turtle < 1.7 , + turtle >= 1.6 && < 1.7 , Default-Language: Haskell2010 Test-Suite doctest diff --git a/stack.ghc-8.10.yaml b/stack.ghc-8.10.yaml index abfe0549c..9e75a7422 100644 --- a/stack.ghc-8.10.yaml +++ b/stack.ghc-8.10.yaml @@ -11,6 +11,7 @@ packages: - dhall-toml - dhall-yaml extra-deps: + - ansi-wl-pprint-1.0.2@sha256:b817853b5310b8e7847469847608b664c3e75b4b30c332f2cb8c0d00751ef9c1,1915 - co-log-core-0.3.2.0 - hashable-1.3.5.0@sha256:3a2beeafb220f9de706568a7e4a5b3c762cc4c9f25c94d7ef795b8c2d6a691d7,4240 - hnix-0.17.0@sha256:57e172f915d70be2dd88c6377caebe8bd63337123ffef42df49b05dc0b1f168b,19224 @@ -20,10 +21,13 @@ extra-deps: - lsp-types-2.0.1.0 - lsp-test-0.15.0.1 - lucid-2.11.0 + - optparse-applicative-0.18.1.0@sha256:b4cf8d9018e5e67cb1f14edb5130b6d05ad8bc1b5f6bd4efaa6ec0b7f28f559d,5132 + - optparse-generic-1.5.2 - relude-1.0.0.1@sha256:35bcdaf14018e79f11e712b0e2314c1aac79976f28f4adc179985457493557d5,11569 - row-types-1.0.1.2@sha256:4d4c7cb95d06a32b28ba977852d52a26b4c1f695ef083a6fd874ab6d79933b64,3071 - semialign-1.2@sha256:9afb6eb7e50db7ca34d7c4108aec0f643dae2caaaa80394b44ffdd643315685c,2721 - text-rope-0.2 + - turtle-1.6.2@sha256:75710c60388e572bc17cbb08a81cbb4537f2207f8dcf187e9b1928d1e0b023a6,5767 - typerep-map-0.5.0.0 nix: packages: diff --git a/stack.ghc-9.2.yaml b/stack.ghc-9.2.yaml index a76e5d303..e6196b280 100644 --- a/stack.ghc-9.2.yaml +++ b/stack.ghc-9.2.yaml @@ -11,6 +11,7 @@ packages: - dhall-toml - dhall-yaml extra-deps: + - ansi-wl-pprint-1.0.2@sha256:b817853b5310b8e7847469847608b664c3e75b4b30c332f2cb8c0d00751ef9c1,1915 - chronos-1.1.5 - hashing-0.1.1.0 - hnix-0.17.0@sha256:57e172f915d70be2dd88c6377caebe8bd63337123ffef42df49b05dc0b1f168b,19224 @@ -20,10 +21,12 @@ extra-deps: - lsp-2.1.0.0 - lsp-types-2.0.1.0 - lsp-test-0.15.0.1 - - optparse-applicative-0.16.1.0 + - optparse-applicative-0.18.1.0@sha256:b4cf8d9018e5e67cb1f14edb5130b6d05ad8bc1b5f6bd4efaa6ec0b7f28f559d,5132 + - optparse-generic-1.5.2 - row-types-1.0.1.2@sha256:4d4c7cb95d06a32b28ba977852d52a26b4c1f695ef083a6fd874ab6d79933b64,3071 - saltine-0.2.1.0 - tomland-1.3.3.2 + - turtle-1.6.2@sha256:75710c60388e572bc17cbb08a81cbb4537f2207f8dcf187e9b1928d1e0b023a6,5767 - typerep-map-0.5.0.0 - validation-selective-0.1.0.2 nix: