From 4e7fe8c3c4403b86316c3c541ff2a9ef8ba4318a Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Mon, 8 Sep 2025 16:38:55 +0200 Subject: [PATCH] Support tar-0.7 Closes #330 --- hackage-repo-tool/hackage-repo-tool.cabal | 2 +- hackage-security/hackage-security.cabal | 2 +- hackage-security/tests/TestSuite.hs | 5 ++++- precompute-fileinfo/precompute-fileinfo.cabal | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hackage-repo-tool/hackage-repo-tool.cabal b/hackage-repo-tool/hackage-repo-tool.cabal index 20fc5f2..182e159 100644 --- a/hackage-repo-tool/hackage-repo-tool.cabal +++ b/hackage-repo-tool/hackage-repo-tool.cabal @@ -73,7 +73,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.20, - tar >= 0.5 && < 0.7, + tar >= 0.5 && < 0.8, zlib >= 0.6 && < 0.8, hackage-security >= 0.6 && < 0.7 diff --git a/hackage-security/hackage-security.cabal b/hackage-security/hackage-security.cabal index 9f98be3..cf58dfb 100644 --- a/hackage-security/hackage-security.cabal +++ b/hackage-security/hackage-security.cabal @@ -123,7 +123,7 @@ library 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, + tar >= 0.5 && < 0.8, template-haskell >= 2.13 && < 2.25, time >= 1.8.0.2 && < 1.16, transformers >= 0.3 && < 0.7, diff --git a/hackage-security/tests/TestSuite.hs b/hackage-security/tests/TestSuite.hs index bc46e68..6e5c428 100644 --- a/hackage-security/tests/TestSuite.hs +++ b/hackage-security/tests/TestSuite.hs @@ -264,7 +264,10 @@ testRepoIndex inMemRepo repo = do _ -> fail "unexpected index entry content" _ -> fail "unexpected index path" -#if MIN_VERSION_tar(0,6,0) + +#if MIN_VERSION_tar(0,7,0) + testEntries1 :: [Tar.GenEntry BS.ByteString Tar.TarPath linkTarget] +#elif MIN_VERSION_tar(0,6,0) testEntries1 :: [Tar.GenEntry Tar.TarPath linkTarget] #else testEntries1 :: [Tar.Entry] diff --git a/precompute-fileinfo/precompute-fileinfo.cabal b/precompute-fileinfo/precompute-fileinfo.cabal index cdaec88..7bef34d 100644 --- a/precompute-fileinfo/precompute-fileinfo.cabal +++ b/precompute-fileinfo/precompute-fileinfo.cabal @@ -37,7 +37,7 @@ executable precompute-fileinfo filepath >= 1.4.2 && < 1.6, optparse-applicative >= 0.13 && < 0.20, SHA >= 1.6.4 && < 1.7, - tar >= 0.5.0.2 && < 0.7, + tar >= 0.5.0.2 && < 0.8, -- tar-0.5.0.2 is the version in Stackage LTS-12.26 (GHC 8.4) zlib >= 0.6.2 && < 0.8 -- zlib-0.6.2 is the version in Stackage LTS-12.26 (GHC 8.4)