Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make it build with ghc-9.10 #71

Merged
merged 2 commits into from
Jul 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.2.8", "9.6.5", "9.8.2"]
ghc: ["9.2.8", "9.6.5", "9.8.2", "9.10.1"]
os: [ubuntu-latest, macos-latest, windows-latest]
cabal: ["3.10.3.0"]

Expand Down
4 changes: 2 additions & 2 deletions hedgehog-extras.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ source-repository head
common aeson { build-depends: aeson >= 2.0.0.0 }
common aeson-pretty { build-depends: aeson-pretty >= 0.8.5 }
common async { build-depends: async }
common base { build-depends: base >= 4.12 && < 4.20 }
common base { build-depends: base >= 4.12 && < 4.21 }
common bytestring { build-depends: bytestring }
common deepseq { build-depends: deepseq }
common Diff { build-depends: Diff }
Expand All @@ -38,7 +38,7 @@ common network { build-depends: network
common process { build-depends: process }
common resourcet { build-depends: resourcet }
common stm { build-depends: stm }
common tar { build-depends: tar < 0.6 }
common tar { build-depends: tar ^>= 0.6 }
common tasty { build-depends: tasty }
common tasty-hedgehog { build-depends: tasty-hedgehog }
common tasty-quickcheck { build-depends: tasty-quickcheck }
Expand Down
2 changes: 1 addition & 1 deletion src/Hedgehog/Extras/Test/Network.hs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ downloadToFile url path = GHC.withFrozenCallStack $ do
H.note_ $ "Downloading " <> url <> " to " <> path
H.evalIO $ HTTP.simpleHttp url >>= LBS.writeFile path

tarErrors :: TAR.Entries (Either TAR.FormatError TAR.TarBombError) -> [Either TAR.FormatError TAR.TarBombError]
tarErrors :: TAR.GenEntries tarPath linkTarget e -> [e]
tarErrors entries = TAR.foldEntries (flip const) id (:) entries []

-- | Download a github commit to a temporary directory, extract it and return the path to the extracted directory.
Expand Down
Loading