Skip to content

Commit d24a887

Browse files
committed
Followup ghc-9.14 support
Now using ghc-9.14.0.20250908.
1 parent 9563b79 commit d24a887

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

cabal.project

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
-- See CONTRIBUTING for Nix commands you need to run if you change it:
2-
index-state: 2025-08-31T23:48:41Z
2+
index-state: 2025-09-28T23:20:19Z
33

44
packages:
55
cardano-prelude
66
cardano-prelude-test
77

88
test-show-details: direct
99

10+
-- cabal-allow-newer
1011
if impl (ghc >= 9.14)
1112
allow-newer:
1213
, OneTuple:base
@@ -29,20 +30,19 @@ if impl (ghc >= 9.14)
2930
, boring:base
3031
, canonical-json:containers
3132
, cardano-prelude:aeson
33+
, cardano-prelude:canonical-json
3234
, cborg:base
3335
, cborg:containers
3436
, constraints:boring
3537
, data-fix:base
3638
, filepath:base
37-
, filepath:bytestring
3839
, generically:base
3940
, ghc-heap:containers
4041
, hashable:base
4142
, hashable:containers
4243
, hashable:ghc-bignum
4344
, hedgehog:async
44-
, hedgehog:bytestring
45-
, hedgehog:lifted-async
45+
, hedgehog:deepseq
4646
, hedgehog:template-haskell
4747
, hedgehog:time
4848
, hsc2hs:base
@@ -52,7 +52,6 @@ if impl (ghc >= 9.14)
5252
, integer-conversion:base
5353
, integer-logarithms:base
5454
, integer-logarithms:ghc-bignum
55-
, lifted-async:base
5655
, primitive:base
5756
, process:base
5857
, quickcheck-instances:OneTuple
@@ -83,6 +82,7 @@ if impl (ghc >= 9.14)
8382
, th-compat:template-haskell
8483
, these:base
8584
, time:base
85+
, time:deepseq
8686
, time:template-haskell
8787
, time-compat:base
8888
, time-compat:time

cardano-prelude/cardano-prelude.cabal

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ library
6161
, ghc-heap
6262
, ghc-prim
6363
, integer-gmp
64-
, microlens
64+
-- Version 0.5 has modified Lens.Micro.Internal which breaks
65+
-- building of the project.
66+
, microlens < 0.5
6567
, mtl
6668
, stm
6769
, tagged

0 commit comments

Comments
 (0)