Skip to content

Commit

Permalink
Make it build with ghc-9.8, continued
Browse files Browse the repository at this point in the history
  • Loading branch information
jorisdral committed Nov 30, 2023
1 parent 15d73bc commit 453e36b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/haskell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.10.7", "9.2.7", "9.4.5", "9.6.1"]
cabal: ["3.10.1.0"]
ghc: ["8.10.7", "9.2.8", "9.4.8", "9.6.3", "9.8.1"]
cabal: ["3.10.2.0"]
os: [ubuntu-latest, windows-latest, macOS-latest]

steps:
Expand Down Expand Up @@ -72,8 +72,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.2.7"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8"]
cabal: ["3.10.2.0"]
os: [ubuntu-latest]

steps:
Expand Down Expand Up @@ -131,8 +131,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.2.7"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8"]
cabal: ["3.10.2.0"]
os: [ubuntu-latest]

steps:
Expand Down Expand Up @@ -190,8 +190,8 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["9.2.7"]
cabal: ["3.10.1.0"]
ghc: ["9.2.8"]
cabal: ["3.10.2.0"]
os: [ubuntu-latest]

steps:
Expand Down
7 changes: 6 additions & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ repository cardano-haskell-packages
c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

index-state:
-- Bump this if you need newer packages from Hackage
, hackage.haskell.org 2023-11-30T00:00:00Z
-- Bump this if you need newer packages from CHaP
, cardano-haskell-packages 2023-11-30T00:00:00Z

packages:
fs-api
fs-sim
Expand All @@ -22,4 +28,3 @@ if impl(ghc >=9.8)
allow-newer:
-- https://github.com/wrengr/unix-bytestring/pull/46
, unix-bytestring:base

2 changes: 1 addition & 1 deletion fs-sim/fs-sim.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ test-suite fs-sim-test
, generics-sop
, pretty-show
, QuickCheck
, quickcheck-state-machine >=0.7.2
, quickcheck-state-machine >=0.7.2 && < 0.8
, random
, tasty
, tasty-hunit
Expand Down

0 comments on commit 453e36b

Please sign in to comment.