From 2e0bb86efd130780cd87b51cd6e9331388e4e608 Mon Sep 17 00:00:00 2001 From: Phil de Joux Date: Mon, 22 Jan 2024 15:48:10 -0500 Subject: [PATCH] Bounds covering ghc-8.4.4 and ghc-9.8.1 - Match ghc-8.4.4 included package lower bounds - Add cabal gen-bounds bounds --- example-client/example-client.cabal | 12 ++--- hackage-repo-tool/hackage-repo-tool.cabal | 17 ++++--- hackage-root-tool/hackage-root-tool.cabal | 6 +-- .../hackage-security-HTTP.cabal | 4 +- .../hackage-security-curl.cabal | 8 ++-- .../hackage-security-http-client.cabal | 11 +++-- hackage-security/hackage-security.cabal | 47 +++++++++---------- precompute-fileinfo/precompute-fileinfo.cabal | 18 +++---- 8 files changed, 60 insertions(+), 63 deletions(-) diff --git a/example-client/example-client.cabal b/example-client/example-client.cabal index 7520fe17..78fae931 100644 --- a/example-client/example-client.cabal +++ b/example-client/example-client.cabal @@ -36,11 +36,11 @@ executable example-client other-modules: ExampleClient.Options build-depends: base >= 4.11 && < 4.20, - bytestring >= 0.9, - directory >= 1.2, - filepath >= 1.2, - optparse-applicative >= 0.11, - time >= 1.5, + bytestring >= 0.10.8.2, + directory >= 1.3.1.5, + filepath >= 1.4.2, + optparse-applicative >= 0.13, + time >= 1.8.0.2, hackage-security >= 0.5, hackage-security-HTTP, hackage-security-curl, @@ -65,5 +65,5 @@ executable example-client if flag(Cabal-syntax) build-depends: Cabal-syntax >= 3.7 && < 3.12 else - build-depends: Cabal >= 1.12 && < 3.7, + 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 84b1181a..67f76176 100644 --- a/hackage-repo-tool/hackage-repo-tool.cabal +++ b/hackage-repo-tool/hackage-repo-tool.cabal @@ -61,18 +61,18 @@ executable hackage-repo-tool -- For boot libraries we try to accomodate the versions bundled with -- the respective GHC release - build-depends: base >= 4.11 && < 4.20, - bytestring >= 0.9 && < 0.13, - directory >= 1.2 && < 1.4, - filepath >= 1.3 && < 1.5, - time >= 1.5 && < 1.13 + build-depends: base >= 4.11 && < 4.20, + bytestring >= 0.10.8.2 && < 0.13, + directory >= 1.3.1.5 && < 1.4, + filepath >= 1.4.2 && < 1.5, + time >= 1.8.0.2 && < 1.13 if !os(windows) - build-depends: unix >= 2.5 && < 2.9 + build-depends: unix >= 2.7.2.2 && < 2.9 -- For non-boot libraries we try to support single major versions -- to reduce the risk of semantic differences build-depends: microlens >= 0.4.11.2 && < 0.5, - optparse-applicative >= 0.15.1 && < 0.18, + optparse-applicative >= 0.13 && < 0.19, tar >= 0.5 && < 0.7, zlib >= 0.6 && < 0.7, hackage-security >= 0.6 && < 0.7 @@ -88,8 +88,7 @@ executable hackage-repo-tool if flag(Cabal-syntax) build-depends: Cabal-syntax >= 3.7 && < 3.12 else - build-depends: Cabal >= 1.14 && < 1.26 - || >= 2.0 && < 2.6 + build-depends: Cabal >= 2.2.0.1 && < 2.6 || >= 3.0 && < 3.7, Cabal-syntax < 3.7 diff --git a/hackage-root-tool/hackage-root-tool.cabal b/hackage-root-tool/hackage-root-tool.cabal index e4a1d7d6..a2c6b1c3 100644 --- a/hackage-root-tool/hackage-root-tool.cabal +++ b/hackage-root-tool/hackage-root-tool.cabal @@ -37,9 +37,9 @@ source-repository head executable hackage-root-tool main-is: Main.hs build-depends: base >= 4.11 && < 5, - filepath >= 1.2 && < 1.5, - optparse-applicative >= 0.11 && < 0.18, - hackage-security >= 0.5 && < 0.7 + filepath >= 1.4.2 && < 1.5, + optparse-applicative >= 0.13 && < 0.19, + hackage-security >= 0.5 && < 0.7 default-language: Haskell2010 other-extensions: CPP, ScopedTypeVariables, RecordWildCards ghc-options: -Wall diff --git a/hackage-security-HTTP/hackage-security-HTTP.cabal b/hackage-security-HTTP/hackage-security-HTTP.cabal index 05b5235a..afbcaa6f 100644 --- a/hackage-security-HTTP/hackage-security-HTTP.cabal +++ b/hackage-security-HTTP/hackage-security-HTTP.cabal @@ -42,9 +42,9 @@ flag use-network-uri library exposed-modules: Hackage.Security.Client.Repository.HttpLib.HTTP build-depends: base >= 4.11 && < 4.20, - bytestring >= 0.9 && < 0.13, + bytestring >= 0.10.8.2 && < 0.13, HTTP >= 4000.2.19 && < 4000.5, - mtl >= 2.1 && < 2.4, + mtl >= 2.2.2 && < 2.4, zlib >= 0.5 && < 0.7, hackage-security >= 0.5 && < 0.7 hs-source-dirs: src diff --git a/hackage-security-curl/hackage-security-curl.cabal b/hackage-security-curl/hackage-security-curl.cabal index 1dad0ad8..96c9bfaf 100644 --- a/hackage-security-curl/hackage-security-curl.cabal +++ b/hackage-security-curl/hackage-security-curl.cabal @@ -32,10 +32,10 @@ flag use-network-uri library exposed-modules: Hackage.Security.Client.Repository.HttpLib.Curl - build-depends: base >= 4.11 && < 4.20, - bytestring >= 0.9, - process >= 1.1, - hackage-security + build-depends: base >= 4.11 && < 4.20, + bytestring >= 0.10.8.2 && < 0.13, + process >= 1.6.3 && < 1.7, + hackage-security >= 0.6.2 && < 0.7 hs-source-dirs: src default-language: Haskell2010 ghc-options: -Wall diff --git a/hackage-security-http-client/hackage-security-http-client.cabal b/hackage-security-http-client/hackage-security-http-client.cabal index 72b772cd..55491881 100644 --- a/hackage-security-http-client/hackage-security-http-client.cabal +++ b/hackage-security-http-client/hackage-security-http-client.cabal @@ -13,6 +13,7 @@ copyright: Copyright 2015 Well-Typed LLP category: Distribution build-type: Simple cabal-version: >=1.10 +extra-source-files: ChangeLog.md tested-with: GHC == 9.8.1 @@ -31,11 +32,11 @@ flag use-network-uri library exposed-modules: Hackage.Security.Client.Repository.HttpLib.HttpClient - build-depends: base >= 4.11 && < 4.20, - bytestring >= 0.9, - http-client >= 0.4 && < 0.8, - http-types >= 0.8, - hackage-security >= 0.5 && < 0.7 + build-depends: base >= 4.11 && < 4.20, + bytestring >= 0.10.8.2 && < 0.13, + http-client >= 0.4 && < 0.8, + http-types >= 0.12.4 && < 0.13, + hackage-security >= 0.5 && < 0.7 hs-source-dirs: src default-language: Haskell2010 default-extensions: FlexibleContexts diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index 80644da4..9ed89132 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -108,38 +108,36 @@ library Hackage.Security.Util.Stack Hackage.Security.Util.TypedEmbedded - build-depends: base >= 4.11 && < 4.20, - base16-bytestring >= 0.1.1 && < 1.1, - base64-bytestring >= 1.0 && < 1.3, - bytestring >= 0.9 && < 0.13, - containers >= 0.4 && < 0.8, - cryptohash-sha256 >= 0.11 && < 0.12, - directory >= 1.2.2 && < 1.4, - ed25519 >= 0.0 && < 0.1, - filepath >= 1.2 && < 1.5, - mtl >= 2.2 && < 2.4, - parsec >= 3.1 && < 3.2, - pretty >= 1.0 && < 1.2, + build-depends: base >= 4.11 && < 4.20, + base16-bytestring >= 0.1.1 && < 1.1, + base64-bytestring >= 1.0 && < 1.3, + bytestring >= 0.10.8.2 && < 0.13, + containers >= 0.5.11 && < 0.8, + cryptohash-sha256 >= 0.11 && < 0.12, + directory >= 1.3.1.5 && < 1.4, + ed25519 >= 0.0 && < 0.1, + filepath >= 1.4.2 && < 1.5, + mtl >= 2.2.2 && < 2.4, + parsec >= 3.1.13 && < 3.2, + pretty >= 1.0 && < 1.2, -- 0.4.2 introduces TarIndex, 0.4.4 introduces more -- functionality, 0.5.0 changes type of serialise - tar >= 0.5 && < 0.7, - template-haskell >= 2.7 && < 2.22, - time >= 1.5 && < 1.13, - transformers >= 0.3 && < 0.7, - zlib >= 0.5 && < 0.7, - -- whatever versions are bundled with ghc: - ghc-prim + tar >= 0.5 && < 0.7, + template-haskell >= 2.13 && < 2.22, + time >= 1.8.0.2 && < 1.13, + transformers >= 0.3 && < 0.7, + zlib >= 0.5 && < 0.7, + ghc-prim >= 0.5.2 && < 0.12 if flag(lukko) build-depends: lukko >= 0.1 && < 0.2 else build-depends: base >= 4.11 - if flag(Cabal-syntax) && impl(ghc >= 8.2) + if flag(Cabal-syntax) build-depends: Cabal-syntax >= 3.7 && < 3.12 else - build-depends: Cabal >= 1.14 && < 1.26 - || >= 2.0 && < 2.6 + build-depends: Cabal >= 2.2.0.1 && < 2.6 || >= 3.0 && < 3.7, Cabal-syntax < 3.7 @@ -240,12 +238,11 @@ test-suite TestSuite time, zlib - if flag(Cabal-syntax) && impl(ghc >= 8.2) + if flag(Cabal-syntax) build-depends: Cabal >= 3.7 && < 3.12, Cabal-syntax >= 3.7 && < 3.12 else - build-depends: Cabal >= 1.14 && < 1.26 - || >= 2.0 && < 2.6 + build-depends: Cabal >= 2.2.0.1 && < 2.6 || >= 3.0 && < 3.7, Cabal-syntax < 3.7 diff --git a/precompute-fileinfo/precompute-fileinfo.cabal b/precompute-fileinfo/precompute-fileinfo.cabal index 8bcf747b..ed88ca7f 100644 --- a/precompute-fileinfo/precompute-fileinfo.cabal +++ b/precompute-fileinfo/precompute-fileinfo.cabal @@ -27,15 +27,15 @@ tested-with: executable precompute-fileinfo main-is: Main.hs - build-depends: base >= 4.11, - bytestring >= 0.9, - containers >= 0.4, - deepseq >= 1.3, - filepath >= 1.2, - optparse-applicative >= 0.11, - SHA >= 1.6, - tar >= 0.4, - zlib >= 0.5 + build-depends: base >= 4.11 && < 4.20, + bytestring >= 0.10.8.2 && < 0.13, + containers >= 0.5.11 && < 0.7, + deepseq >= 1.4.3 && < 1.6, + filepath >= 1.4.2 && < 1.5, + optparse-applicative >= 0.13 && < 0.19, + SHA >= 1.6.4 && < 1.7, + tar >= 0.6.0 && < 0.7, + zlib >= 0.6.3 && < 0.7 hs-source-dirs: src default-language: Haskell2010 default-extensions: RecordWildCards