Skip to content

Commit a6201d1

Browse files
authored
Support ghc 9.14 (#7335)
* cabal.project: Update index-states * plutus-core: Remove lower bound on cardano-crypto-class dep * Support ghc-9.14 * Nix updates
1 parent f659d22 commit a6201d1

File tree

5 files changed

+90
-13
lines changed

5 files changed

+90
-13
lines changed

cabal.project

Lines changed: 74 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ repository cardano-haskell-packages
1414
-- update either of these.
1515
index-state:
1616
-- Bump both the following dates if you need newer packages from Hackage
17-
, hackage.haskell.org 2025-09-21T21:31:06Z
17+
, hackage.haskell.org 2026-02-17T00:47:24Z
1818
-- Bump this if you need newer packages from CHaP
19-
, cardano-haskell-packages 2026-02-11T11:49:13Z
19+
, cardano-haskell-packages 2026-02-13T00:00:04Z
2020

2121
packages: cardano-constitution
2222
plutus-benchmark
@@ -88,3 +88,75 @@ allow-newer:
8888
-- https://github.com/IntersectMBO/plutus/pull/7236
8989
constraints: setup.optparse-applicative >=0.19.0.0
9090
allow-newer: turtle:optparse-applicative
91+
92+
if impl (ghc >= 9.14)
93+
-- https://github.com/snowleopard/alga/issues/322
94+
source-repository-package
95+
type: git
96+
location: https://github.com/snowleopard/alga/
97+
tag: d4e43fb42db05413459fb2df493361d5a666588a
98+
99+
if impl (ghc >= 9.14)
100+
constraints:
101+
, brick >= 2.10
102+
, quickcheck-instances >= 0.4
103+
, string-interpolate >= 0.3
104+
105+
allow-newer:
106+
-- https://github.com/IntersectMBO/plutus/issues/7597
107+
, aeson:OneTuple
108+
, aeson:containers
109+
, aeson:data-fix
110+
, aeson:indexed-traversable
111+
, aeson:QuickCheck
112+
, aeson:scientific
113+
, aeson:semialign
114+
, aeson:template-haskell
115+
, aeson:text-iso8601
116+
, aeson:these
117+
, aeson:time
118+
, aeson:time-compat
119+
, binary-orphans:base
120+
, boring:base
121+
, cborg:base
122+
, cborg:containers
123+
, cborg:ghc-prim
124+
, config-ini:containers
125+
, hedgehog-fn:hedgehog
126+
, hedgehog-quickcheck:QuickCheck
127+
, indexed-traversable:base
128+
, indexed-traversable:containers
129+
, indexed-traversable-instances:base
130+
, microstache:base
131+
, microstache:containers
132+
, quickcheck-instances:QuickCheck
133+
, quickcheck-instances:base
134+
, serialise:base
135+
, serialise:containers
136+
, serialise:time
137+
, semialign:base
138+
, semialign:containers
139+
, these:base
140+
, string-interpolate:template-haskell
141+
, tree-diff:base
142+
, tree-diff:containers
143+
, tree-diff:QuickCheck
144+
, turtle:containers
145+
, turtle:time
146+
, universe-base:base
147+
, universe-base:containers
148+
, uuid-types:bytestring
149+
, uuid-types:template-haskell
150+
, with-utf8:base
151+
, bin:base
152+
, bin:QuickCheck
153+
, dec:base
154+
, fin:base
155+
, fin:QuickCheck
156+
, ral:base
157+
, ral:QuickCheck
158+
, constraints-extras:template-haskell
159+
, dependent-map:containers
160+
, dictionary-sharing:containers
161+
, ordered-containers:containers
162+
, nonempty-vector:base

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.

plutus-core/flat/test/Test/Data/Arbitrary.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import Data.List.NonEmpty qualified as BI
2020

2121
import Numeric.Natural (Natural)
2222

23-
#if MIN_VERSION_base(4,8,0) && MIN_VERSION_QuickCheck(2,10,0)
23+
#if MIN_VERSION_QuickCheck(2,10,0) && ! MIN_VERSION_QuickCheck(2,17,0)
2424
instance Arbitrary a => Arbitrary (BI.NonEmpty a) where
2525
arbitrary = BI.fromList . getNonEmpty <$> (arbitrary :: Gen (NonEmptyList a))
2626
shrink xs = BI.fromList <$> shrink (BI.toList xs)

plutus-core/plutus-core.cabal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ library
308308
, base64-bytestring
309309
, bimap
310310
, bytestring
311-
, cardano-crypto-class ^>=2.3
311+
, cardano-crypto-class
312312
, cassava
313313
, cborg
314314
, composition-prelude >=1.1.0.1
@@ -738,7 +738,7 @@ executable plutus
738738
, singletons-th
739739
, text
740740
, text-zipper
741-
, vty ^>=6.2
741+
, vty ^>=6.5
742742
, vty-crossplatform ^>=0.4
743743

744744
ghc-options: -O2 -threaded -rtsopts -with-rtsopts=-N

plutus-tx/plutus-tx.cabal

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,15 @@ common lang
3737
-- -fobject-code -fno-ignore-interface-pragmas and -fno-omit-interface-pragmas
3838
ghc-options:
3939
-Wall -Wnoncanonical-monad-instances -Wincomplete-uni-patterns
40-
-Wincomplete-record-updates -Wredundant-constraints -Widentities
41-
-Wunused-packages -Wmissing-deriving-strategies -fobject-code
40+
-Wincomplete-record-updates -Widentities -Wunused-packages
41+
-Wmissing-deriving-strategies -fobject-code
4242
-fno-ignore-interface-pragmas -fno-omit-interface-pragmas
4343

44+
-- ghc-9.14 gives redundant constraint warnings on some constraints
45+
-- that are needed for earlier compilers.
46+
if impl(ghc <9.14)
47+
ghc-options: -Wredundant-constraints
48+
4449
library
4550
import: lang
4651
hs-source-dirs: src

0 commit comments

Comments
 (0)