From 58c0dfa9d3f56a6d9eb0d9119e712a8bf4575b7f Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 3 Sep 2024 14:52:24 +0200 Subject: [PATCH] Bump Cabal and Cabal-syntax to allow 3.14 I have tested the change by running `cabal build all && cabal test all` with the following cabal.project.local: packages: /path-to-cabal-repo/Cabal packages: /path-to-cabal-repo/Cabal-syntax constraints: Cabal==3.14.* constraints: Cabal-syntax==3.14.* where /path-to-cabal-repo is my local checkout of cabal 3.14 --- example-client/example-client.cabal | 2 +- hackage-repo-tool/hackage-repo-tool.cabal | 2 +- hackage-security/hackage-security.cabal | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/example-client/example-client.cabal b/example-client/example-client.cabal index 4be6cfd..885ad06 100644 --- a/example-client/example-client.cabal +++ b/example-client/example-client.cabal @@ -55,7 +55,7 @@ executable example-client ghc-options: -Wall if flag(Cabal-syntax) - build-depends: Cabal-syntax >= 3.7 && < 3.14 + build-depends: Cabal-syntax >= 3.7 && < 3.16 else build-depends: Cabal >= 2.2.0.1 && < 3.7, Cabal-syntax < 3.7 diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal index dedb7f3..c874654 100644 --- a/hackage-repo-tool/hackage-repo-tool.cabal +++ b/hackage-repo-tool/hackage-repo-tool.cabal @@ -75,7 +75,7 @@ executable hackage-repo-tool hackage-security >= 0.6 && < 0.7 if flag(Cabal-syntax) - build-depends: Cabal-syntax >= 3.7 && < 3.14 + build-depends: Cabal-syntax >= 3.7 && < 3.16 else build-depends: Cabal >= 2.2.0.1 && < 2.6 || >= 3.0 && < 3.7, diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index 67da486..352b548 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -136,7 +136,7 @@ library build-depends: base >= 4.11 if flag(Cabal-syntax) - build-depends: Cabal-syntax >= 3.7 && < 3.14 + build-depends: Cabal-syntax >= 3.7 && < 3.16 else build-depends: Cabal >= 2.2.0.1 && < 2.6 || >= 3.0 && < 3.7, @@ -201,8 +201,8 @@ test-suite TestSuite zlib if flag(Cabal-syntax) - build-depends: Cabal >= 3.7 && < 3.14, - Cabal-syntax >= 3.7 && < 3.14 + build-depends: Cabal >= 3.7 && < 3.16, + Cabal-syntax >= 3.7 && < 3.16 else build-depends: Cabal >= 2.2.0.1 && < 2.6 || >= 3.0 && < 3.7,