Skip to content

Commit c37566a

Browse files
authored
Merge pull request #510 from IntersectMBO/erikd/ghc-9.12
Support ghc-9.12
2 parents ded795b + 2224483 commit c37566a

File tree

4 files changed

+32
-12
lines changed

4 files changed

+32
-12
lines changed

.github/workflows/haskell.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
strategy:
6363
fail-fast: false
6464
matrix:
65-
ghc: ["8.10.7", "9.2.8", "9.6.6", "9.8.2", "9.10.1"]
65+
ghc: ["8.10.7", "9.2.8", "9.6.6", "9.8.2", "9.10.1", "9.12.1"]
6666
os: [ubuntu-latest, macos-13, macos-latest, windows-latest]
6767
# GHC versions older than ghc-9.2 are not supported on macos-latest
6868
exclude:
@@ -76,6 +76,8 @@ jobs:
7676
ghc: "9.8.2"
7777
- os: macos-13
7878
ghc: "9.10.1"
79+
- os: macos-13
80+
ghc: "9.12.1"
7981

8082
env:
8183
# Modify this value to "invalidate" the cabal cache.

cabal.project

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ repository cardano-haskell-packages
1010
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
1111

1212
-- The hackage index-state
13-
index-state: 2024-12-10T00:00:00Z
14-
-- The CHaP index-state
15-
index-state: cardano-haskell-packages 2024-10-10T04:22:19Z
13+
index-state: 2025-01-14T23:25:37Z
14+
index-state: cardano-haskell-packages 2025-01-13T22:30:16Z
1615
packages:
1716
base-deriving-via
1817
cardano-binary
@@ -39,3 +38,23 @@ program-options
3938
package bitvec
4039
-- Workaround for windows cross-compilation
4140
flags: -simd
41+
42+
if impl(ghc >=9.12)
43+
allow-newer:
44+
-- Stuck on `cabal-3.14` issues and maintainer difficulties
45+
-- https://github.com/haskell/aeson/issues/1124
46+
-- Stuck on `cabal-3.14` and unresponsive maintainers
47+
-- https://github.com/well-typed/cborg/pull/339
48+
-- Fix blocked by aeson
49+
-- https://github.com/haskellari/microstache/issues/43
50+
-- Difficult maintainer
51+
-- https://github.com/haskellari/tree-diff/issues/97
52+
, aeson:ghc-prim
53+
, aeson:template-haskell
54+
, cborg:base
55+
, cborg:ghc-prim
56+
, serialise:base
57+
, serialise:ghc-prim
58+
, microstache:base
59+
, tree-diff:base
60+
, tree-diff:time

cardano-crypto-tests/src/Test/Crypto/AllocLog.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
module Test.Crypto.AllocLog where
77

88
import Control.Tracer
9-
import Data.Typeable
109
import Foreign.Concurrent
1110
import Foreign.Ptr
1211

@@ -23,7 +22,7 @@ data AllocEvent
2322
= AllocEv !WordPtr
2423
| FreeEv !WordPtr
2524
| MarkerEv !String
26-
deriving (Eq, Show, Typeable)
25+
deriving (Eq, Show)
2726

2827
mkLoggingAllocator ::
2928
Tracer IO AllocEvent -> MLockedAllocator IO -> MLockedAllocator IO

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)