From 5432efc66629e72fc36e36474d2c9839ede315fc Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 18 Jun 2025 11:38:46 +0100 Subject: [PATCH 1/5] Bump Haskell CI for 9.10 to 9.10.2 --- .github/workflows/haskell-ci.yml | 12 ++++++------ example-client/example-client.cabal | 2 +- hackage-repo-tool/hackage-repo-tool.cabal | 2 +- hackage-root-tool/hackage-root-tool.cabal | 2 +- hackage-security-HTTP/hackage-security-HTTP.cabal | 2 +- hackage-security-curl/hackage-security-curl.cabal | 2 +- .../hackage-security-http-client.cabal | 2 +- hackage-security/hackage-security.cabal | 2 +- precompute-fileinfo/precompute-fileinfo.cabal | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 053790e..8586e5d 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20250330 +# version: 0.19.20250506 # -# REGENDATA ("0.19.20250330",["github","cabal.project"]) +# REGENDATA ("0.19.20250506",["github","cabal.project"]) # name: Haskell-CI on: @@ -37,9 +37,9 @@ jobs: compilerVersion: 9.12.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.10.1 + - compiler: ghc-9.10.2 compilerKind: ghc - compilerVersion: 9.10.1 + compilerVersion: 9.10.2 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.4 @@ -100,8 +100,8 @@ jobs: chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | diff --git a/example-client/example-client.cabal b/example-client/example-client.cabal index 52c09fe..94a7333 100644 --- a/example-client/example-client.cabal +++ b/example-client/example-client.cabal @@ -13,7 +13,7 @@ cabal-version: >=1.10 tested-with: GHC == 9.12.2 - GHC == 9.10.1 + GHC == 9.10.2 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal index d22cad7..4d5b938 100644 --- a/hackage-repo-tool/hackage-repo-tool.cabal +++ b/hackage-repo-tool/hackage-repo-tool.cabal @@ -25,7 +25,7 @@ bug-reports: https://github.com/haskell/hackage-security/issues tested-with: GHC == 9.12.2 - GHC == 9.10.1 + GHC == 9.10.2 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 diff --git a/hackage-root-tool/hackage-root-tool.cabal b/hackage-root-tool/hackage-root-tool.cabal index bd695c7..5c09fcf 100644 --- a/hackage-root-tool/hackage-root-tool.cabal +++ b/hackage-root-tool/hackage-root-tool.cabal @@ -17,7 +17,7 @@ cabal-version: >=1.10 tested-with: GHC == 9.12.2 - GHC == 9.10.1 + GHC == 9.10.2 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 diff --git a/hackage-security-HTTP/hackage-security-HTTP.cabal b/hackage-security-HTTP/hackage-security-HTTP.cabal index 64f9534..ba7f81e 100644 --- a/hackage-security-HTTP/hackage-security-HTTP.cabal +++ b/hackage-security-HTTP/hackage-security-HTTP.cabal @@ -20,7 +20,7 @@ build-type: Simple tested-with: GHC == 9.12.2 - GHC == 9.10.1 + GHC == 9.10.2 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 diff --git a/hackage-security-curl/hackage-security-curl.cabal b/hackage-security-curl/hackage-security-curl.cabal index 3b0bf81..150d10e 100644 --- a/hackage-security-curl/hackage-security-curl.cabal +++ b/hackage-security-curl/hackage-security-curl.cabal @@ -17,7 +17,7 @@ cabal-version: >=1.10 tested-with: GHC == 9.12.2 - GHC == 9.10.1 + GHC == 9.10.2 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 diff --git a/hackage-security-http-client/hackage-security-http-client.cabal b/hackage-security-http-client/hackage-security-http-client.cabal index ed7c158..d040849 100644 --- a/hackage-security-http-client/hackage-security-http-client.cabal +++ b/hackage-security-http-client/hackage-security-http-client.cabal @@ -17,7 +17,7 @@ extra-source-files: ChangeLog.md tested-with: GHC == 9.12.2 - GHC == 9.10.1 + GHC == 9.10.2 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index a765fd4..2b7df3b 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -32,7 +32,7 @@ build-type: Simple tested-with: GHC == 9.12.2 - GHC == 9.10.1 + GHC == 9.10.2 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 diff --git a/precompute-fileinfo/precompute-fileinfo.cabal b/precompute-fileinfo/precompute-fileinfo.cabal index e768e29..4022500 100644 --- a/precompute-fileinfo/precompute-fileinfo.cabal +++ b/precompute-fileinfo/precompute-fileinfo.cabal @@ -16,7 +16,7 @@ cabal-version: >=1.10 tested-with: GHC == 9.12.2 - GHC == 9.10.1 + GHC == 9.10.2 GHC == 9.8.4 GHC == 9.6.7 GHC == 9.4.8 From 2b585051796278ca57fd3047938cf58dedf8d95f Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 18 Jun 2025 12:13:52 +0100 Subject: [PATCH 2/5] Bump optparse-applicative to <0.20 --- hackage-repo-tool/hackage-repo-tool.cabal | 2 +- hackage-root-tool/hackage-root-tool.cabal | 2 +- precompute-fileinfo/precompute-fileinfo.cabal | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal index 4d5b938..ce2aa03 100644 --- a/hackage-repo-tool/hackage-repo-tool.cabal +++ b/hackage-repo-tool/hackage-repo-tool.cabal @@ -71,7 +71,7 @@ executable hackage-repo-tool build-depends: microlens >= 0.4.9.1 && < 0.5, -- microlens-0.4.9.1 is the version in Stackage LTS-12.26 (GHC 8.4) - optparse-applicative >= 0.13 && < 0.19, + optparse-applicative >= 0.13 && < 0.20, tar >= 0.5 && < 0.7, zlib >= 0.6 && < 0.8, hackage-security >= 0.6 && < 0.7 diff --git a/hackage-root-tool/hackage-root-tool.cabal b/hackage-root-tool/hackage-root-tool.cabal index 5c09fcf..4df1975 100644 --- a/hackage-root-tool/hackage-root-tool.cabal +++ b/hackage-root-tool/hackage-root-tool.cabal @@ -40,7 +40,7 @@ executable hackage-root-tool main-is: Main.hs build-depends: base >= 4.11 && < 5, filepath >= 1.4.2 && < 1.6, - optparse-applicative >= 0.13 && < 0.19, + optparse-applicative >= 0.13 && < 0.20, hackage-security >= 0.5 && < 0.7 default-language: Haskell2010 other-extensions: CPP, ScopedTypeVariables, RecordWildCards diff --git a/precompute-fileinfo/precompute-fileinfo.cabal b/precompute-fileinfo/precompute-fileinfo.cabal index 4022500..e87ce5a 100644 --- a/precompute-fileinfo/precompute-fileinfo.cabal +++ b/precompute-fileinfo/precompute-fileinfo.cabal @@ -34,7 +34,7 @@ executable precompute-fileinfo containers >= 0.5.11 && < 0.8, deepseq >= 1.4.3 && < 1.6, filepath >= 1.4.2 && < 1.6, - optparse-applicative >= 0.13 && < 0.19, + optparse-applicative >= 0.13 && < 0.20, SHA >= 1.6.4 && < 1.7, tar >= 0.5.0.2 && < 0.7, -- tar-0.5.0.2 is the version in Stackage LTS-12.26 (GHC 8.4) From 4dc0af2b4333476aa449455d8972f650cd204d65 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 18 Jun 2025 12:28:00 +0100 Subject: [PATCH 3/5] Bump QuickCheck to <2.17 --- hackage-security/hackage-security.cabal | 2 +- hackage-security/tests/TestSuite.hs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index 2b7df3b..ce106ed 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -213,7 +213,7 @@ test-suite TestSuite -- tasty-1.1.0.4 is the version in Stackage LTS 12.26 (GHC 8.4) tasty-hunit == 0.10.*, tasty-quickcheck >= 0.10 && < 1, - QuickCheck >= 2.11 && < 2.16, + QuickCheck >= 2.11 && < 2.17, aeson >= 1.4 && < 1.6 || >= 2.0 && < 2.3, vector >= 0.12 && < 0.14, unordered-containers >= 0.2.8.0 && < 0.3, diff --git a/hackage-security/tests/TestSuite.hs b/hackage-security/tests/TestSuite.hs index 0949b05..bc46e68 100644 --- a/hackage-security/tests/TestSuite.hs +++ b/hackage-security/tests/TestSuite.hs @@ -2,14 +2,14 @@ module Main (main) where -- stdlib -import Control.Exception -import Control.Monad +import Control.Exception ( handleJust ) +import Control.Monad ( unless ) import Data.Maybe (fromJust) -import Data.Time -import Network.URI (URI, parseURI) -import Test.Tasty -import Test.Tasty.HUnit -import Test.Tasty.QuickCheck hiding (label) +import Data.Time ( UTCTime, getCurrentTime ) +import Network.URI ( URI, parseURI ) +import Test.Tasty ( defaultMain, testGroup, TestTree ) +import Test.Tasty.HUnit ( testCase, (@?=), assertEqual, assertFailure, Assertion ) +import Test.Tasty.QuickCheck ( testProperty ) import System.IO.Temp (withSystemTempDirectory) import qualified Codec.Archive.Tar.Entry as Tar import qualified Data.ByteString.Lazy.Char8 as BS From bf60c17d46c55f05985efc88ea4add9c7d554831 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 18 Jun 2025 18:47:48 +0100 Subject: [PATCH 4/5] hackage-security: bump version to 0.6.3.1 --- hackage-security/ChangeLog.md | 7 +++++++ hackage-security/hackage-security.cabal | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/hackage-security/ChangeLog.md b/hackage-security/ChangeLog.md index d22d85c..402667a 100644 --- a/hackage-security/ChangeLog.md +++ b/hackage-security/ChangeLog.md @@ -1,5 +1,12 @@ See also http://pvp.haskell.org/faq +0.6.3.1 +------- + +* Allow `QuickCheck-2.16`. +* Tested with GHC 8.4 - 9.12. + + 0.6.3.0 ------- diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index ce106ed..17d6196 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 name: hackage-security -version: 0.6.3.0 +version: 0.6.3.1 synopsis: Hackage security library description: The hackage security library provides both server and From 6fc5ff44ceac3914767860c13ff09bfb3fec7404 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Wed, 18 Jun 2025 18:50:47 +0100 Subject: [PATCH 5/5] hackage-repo-tool: bump to revision 2 --- hackage-repo-tool/hackage-repo-tool.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal index ce2aa03..d7164e4 100644 --- a/hackage-repo-tool/hackage-repo-tool.cabal +++ b/hackage-repo-tool/hackage-repo-tool.cabal @@ -1,7 +1,7 @@ cabal-version: 1.12 name: hackage-repo-tool version: 0.1.1.4 -x-revision: 1 +x-revision: 2 build-type: Simple synopsis: Manage secure file-based package repositories