From 244c0ff26f5831fd12f993c8af8a6817a9331cdd Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Fri, 26 Feb 2021 17:57:18 +0100 Subject: [PATCH 1/3] dhall: Allow building with GHC 9.0.1 --- dhall/dhall.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index 6d14c8e43..9bd1a39ff 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -510,7 +510,7 @@ Library repline >= 0.4.0.0 && < 0.5 , serialise >= 0.2.0.0 && < 0.3 , scientific >= 0.3.0.0 && < 0.4 , - template-haskell >= 2.13.0.0 && < 2.17, + template-haskell >= 2.13.0.0 && < 2.18, text >= 0.11.1.0 && < 1.3 , text-manipulate >= 0.2.0.1 && < 0.4 , th-lift-instances >= 0.1.13 && < 0.2 , From efb8172ecffcba36fcbbf1f364c4eb636322bc0e Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Sat, 8 May 2021 17:54:45 +0200 Subject: [PATCH 2/3] Allow cryptonite-0.29 --- dhall-docs/dhall-docs.cabal | 2 +- dhall/dhall.cabal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dhall-docs/dhall-docs.cabal b/dhall-docs/dhall-docs.cabal index 6709ef573..7d641a146 100644 --- a/dhall-docs/dhall-docs.cabal +++ b/dhall-docs/dhall-docs.cabal @@ -65,7 +65,7 @@ Library base >= 4.11.0.0 && < 5 , bytestring < 0.12, containers , - cryptonite < 0.29, + cryptonite < 0.30, directory >= 1.3.0.0 && < 1.4 , dhall >= 1.38.0 && < 1.39, file-embed >= 0.0.10.0 , diff --git a/dhall/dhall.cabal b/dhall/dhall.cabal index 9bd1a39ff..542e5db6c 100644 --- a/dhall/dhall.cabal +++ b/dhall/dhall.cabal @@ -533,7 +533,7 @@ Library else Hs-Source-Dirs: ghc-src Build-Depends: - cryptonite >= 0.23 && < 1.0 + cryptonite >= 0.23 && < 0.30 if flag(with-http) Build-Depends: http-types >= 0.7.0 && < 0.13, From d970cf0d4fa5a3dd777f14edff4e4ee59c65770c Mon Sep 17 00:00:00 2001 From: Simon Jakobi Date: Sun, 9 May 2021 02:39:14 +0200 Subject: [PATCH 3/3] dhall-docs:tasty: Restrict hashable --- dhall-docs/dhall-docs.cabal | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dhall-docs/dhall-docs.cabal b/dhall-docs/dhall-docs.cabal index 7d641a146..0c52bc219 100644 --- a/dhall-docs/dhall-docs.cabal +++ b/dhall-docs/dhall-docs.cabal @@ -137,6 +137,12 @@ Test-Suite tasty dhall , dhall-docs , foldl < 1.5 , + + -- hashable isn't used directly, but lucid's rendering output depends + -- on the Hashable Text instance defined in hashable. + -- See https://github.com/chrisdone/lucid/issues/107. + hashable < 1.3.1 , + path , path-io , pretty >= 1.1.1.1 ,