Skip to content

Commit b514257

Browse files
authored
Merge pull request #653 from input-output-hk/erikd/ghc-9.12
Make it build with ghc 9.12
2 parents c16d8a1 + df654b3 commit b514257

File tree

8 files changed

+123
-232
lines changed

8 files changed

+123
-232
lines changed

.github/workflows/haskell.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
ghc: ["8.10.7", "9.6", "9.8", "9.10"]
14+
ghc: ["8.10.7", "9.6", "9.8", "9.10", "9.12"]
1515
os: [ubuntu-latest, macos-13, windows-latest]
1616

1717
env:
@@ -72,12 +72,6 @@ jobs:
7272
MSYSTEM: MINGW64
7373
run: cabal test all --enable-tests --test-show-details=direct -j1
7474

75-
- uses: actions/upload-artifact@v3
76-
with:
77-
name: Build & test logs
78-
path: |
79-
dist-newstyle/**/*.log
80-
8175
# - name: Run benchmarks
8276
# run: cabal bench all --enable-tests
8377

cabal.project

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
1313
-- See CONTRIBUTING for information about these, including some Nix commands
1414
-- you need to run if you change them
1515
index-state:
16-
, hackage.haskell.org 2024-08-25T21:36:13Z
17-
, cardano-haskell-packages 2024-08-25T15:05:06Z
16+
, hackage.haskell.org 2025-03-10T23:11:34Z
17+
, cardano-haskell-packages 2025-03-04T15:51:45Z
1818

1919
packages:
2020
contra-tracer
@@ -37,16 +37,24 @@ test-show-details: direct
3737

3838
constraints:
3939
, feed >= 1.3
40-
, text >= 2.0
4140

4241
allow-newer:
4342
, feed:base
4443
, snap-server:base
4544

45+
-- https://github.com/ocharles/libsystemd-journal/pull/32
46+
, libsystemd-journal:base
47+
48+
4649
package comonad
4750
flags: -test-doctests
4851

4952
if os(windows)
5053
-- Avoid `unknown symbol __cpu_model` when cross compilation runs TH code
5154
package bitvec
5255
flags: -simd
56+
57+
if impl (ghc >= 9.12)
58+
allow-newer:
59+
-- https://github.com/Gabriella439/Haskell-Pipes-Safe-Library/pull/70
60+
, pipes-safe:base

0 commit comments

Comments
 (0)