From 3f0535b4799980e6a934399d3e8f228ee229b7ca Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Thu, 8 Feb 2024 13:24:00 +0100 Subject: [PATCH] Allow zlib-0.7 Also: Delete x-revision field from hackage-security-HTTP.cabal etc. These .cabal files contain at this point changes we do not want to release in a revision. --- hackage-repo-tool/hackage-repo-tool.cabal | 3 +-- hackage-security-HTTP/hackage-security-HTTP.cabal | 4 ++-- hackage-security/hackage-security.cabal | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal index 3eee18cc..64d3e26b 100644 --- a/hackage-repo-tool/hackage-repo-tool.cabal +++ b/hackage-repo-tool/hackage-repo-tool.cabal @@ -1,7 +1,6 @@ cabal-version: 1.12 name: hackage-repo-tool version: 0.1.1.3 -x-revision: 5 build-type: Simple synopsis: Manage secure file-based package repositories @@ -76,7 +75,7 @@ executable hackage-repo-tool build-depends: microlens >= 0.4.11.2 && < 0.5, optparse-applicative >= 0.15.1 && < 0.18, tar >= 0.5 && < 0.7, - zlib >= 0.6 && < 0.7, + zlib >= 0.6 && < 0.8, hackage-security >= 0.6 && < 0.7 -- see comments in hackage-security.cabal diff --git a/hackage-security-HTTP/hackage-security-HTTP.cabal b/hackage-security-HTTP/hackage-security-HTTP.cabal index 701d04b1..f0b1f735 100644 --- a/hackage-security-HTTP/hackage-security-HTTP.cabal +++ b/hackage-security-HTTP/hackage-security-HTTP.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: hackage-security-HTTP version: 0.1.1.1 -x-revision: 7 + synopsis: Hackage security bindings against the HTTP library description: The hackage security library provides a 'HttpLib' abstraction to allow to bind against different HTTP @@ -47,7 +47,7 @@ library bytestring >= 0.9 && < 0.13, HTTP >= 4000.2.19 && < 4000.5, mtl >= 2.1 && < 2.4, - zlib >= 0.5 && < 0.7, + zlib >= 0.5 && < 0.8, hackage-security >= 0.5 && < 0.7 hs-source-dirs: src default-language: Haskell2010 diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index 2273a489..1ee687e5 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -128,7 +128,7 @@ library template-haskell >= 2.7 && < 2.22, time >= 1.5 && < 1.13, transformers >= 0.3 && < 0.7, - zlib >= 0.5 && < 0.7, + zlib >= 0.5 && < 0.8, -- whatever versions are bundled with ghc: ghc-prim