From bb5957782b5ce3336142d0a6d5ab41cbc337276a Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 27 May 2024 08:51:52 +1000 Subject: [PATCH] Make it build with ghc 9.10 --- cabal.project | 6 ++++++ persistent-redis/persistent-redis.cabal | 2 +- persistent/persistent.cabal | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index 447eb5faa..f4d35299f 100644 --- a/cabal.project +++ b/cabal.project @@ -26,3 +26,9 @@ allow-newer: -- type: git -- location: https://github.com/ysangkok/hedis -- tag: 6f36989836b49974f51a6ee8edaf156490590980 + +-- These should be removed before this PR is merged. +allow-newer: + , vault:base + , postgresql-libpq:base + , bytestring-lexing:base diff --git a/persistent-redis/persistent-redis.cabal b/persistent-redis/persistent-redis.cabal index 6d3f609ce..c51defd47 100644 --- a/persistent-redis/persistent-redis.cabal +++ b/persistent-redis/persistent-redis.cabal @@ -21,7 +21,7 @@ library , persistent >= 2.12 && < 3.0 , aeson >= 1.0 , binary >= 0.8 && < 0.9 - , bytestring >= 0.10.8 && < 0.12 + , bytestring >= 0.10.8 && < 0.13 , hedis >= 0.9 , http-api-data , mtl >= 2.2.1 && < 2.4 diff --git a/persistent/persistent.cabal b/persistent/persistent.cabal index e50010262..1a72eb764 100644 --- a/persistent/persistent.cabal +++ b/persistent/persistent.cabal @@ -36,7 +36,7 @@ library , resourcet >= 1.1.10 , scientific , silently - , template-haskell >= 2.13 && < 2.22 + , template-haskell >= 2.13 && < 2.23 , text >= 1.2 , th-lift-instances >= 0.1.14 && < 0.2 , time >= 1.6