Skip to content

Commit 26c895f

Browse files
erikderikd
committed
Preliminary ghc-9.14 support
Currently using ghc-9.14.0.20251028 (-rc1).
1 parent 4c0a57e commit 26c895f

File tree

8 files changed

+281
-15
lines changed

8 files changed

+281
-15
lines changed

‎cabal.project‎

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,204 @@ allow-newer:
8383
-- https://github.com/IntersectMBO/plutus/pull/7236
8484
constraints: setup.optparse-applicative >=0.19.0.0
8585
allow-newer: turtle:optparse-applicative
86+
87+
if impl (ghc >= 9.14)
88+
-- https://github.com/snowleopard/alga/issues/322
89+
source-repository-package
90+
type: git
91+
location: https://github.com/snowleopard/alga/
92+
tag: d4e43fb42db05413459fb2df493361d5a666588a
93+
94+
if impl (ghc >= 9.14)
95+
constraints:
96+
, nothunks ^>= 0.2
97+
, microlens ^>= 0.4
98+
, microlens-mtl < 0.2.1.1
99+
, microlens-th < 0.4.3.18
100+
-- Newest version causes Arbitrary instance clashes in quickcheck-instances.
101+
, QuickCheck < 2.17.0.0
102+
103+
-- cabal-allow-newer
104+
if impl (ghc >= 9.14)
105+
allow-newer:
106+
, Cabal:Cabal-syntax
107+
, Cabal:containers
108+
, Cabal-syntax:containers
109+
, OneTuple:base
110+
, QuickCheck:base
111+
, QuickCheck:splitmix
112+
, aeson:OneTuple
113+
, aeson:containers
114+
, aeson:data-fix
115+
, aeson:ghc-prim
116+
, aeson:indexed-traversable
117+
, aeson:scientific
118+
, aeson:semialign
119+
, aeson:template-haskell
120+
, aeson:text-iso8601
121+
, aeson:these
122+
, aeson:time
123+
, aeson:time-compat
124+
, aeson:witherable
125+
, assoc:base
126+
, async:base
127+
, bifunctors:template-haskell
128+
, bin:base
129+
, binary:containers
130+
, binary-orphans:base
131+
, boring:base
132+
, brick:base
133+
, canonical-json:containers
134+
, cardano-crypto-class:io-classes
135+
, cborg:base
136+
, cborg:containers
137+
, cborg:ghc-prim
138+
, concurrent-output:process
139+
, config-ini:containers
140+
, config-ini:text
141+
, constraints-extras:base
142+
, constraints-extras:template-haskell
143+
, containers:base
144+
, containers:template-haskell
145+
, criterion:aeson
146+
, data-default:containers
147+
, data-default-class:data-default
148+
, data-fix:base
149+
, dec:base
150+
, deepseq:base
151+
, deepseq:ghc-prim
152+
, dependent-map:containers
153+
, deriving-compat:containers
154+
, deriving-compat:template-haskell
155+
, dictionary-sharing:containers
156+
, directory:base
157+
, directory:time
158+
, fin:base
159+
, fin:universe-base
160+
, foldl:containers
161+
, free:containers
162+
, free:template-haskell
163+
, generically:base
164+
, ghc-heap:containers
165+
, ghc-heap:ghc-internal
166+
, hashable:base
167+
, hashable:containers
168+
, hashable:ghc-bignum
169+
, hedgehog:containers
170+
, hedgehog:template-haskell
171+
, hedgehog:time
172+
, hedgehog-fn:hedgehog
173+
, hsc2hs:base
174+
, indexed-traversable:base
175+
, indexed-traversable:containers
176+
, indexed-traversable-instances:base
177+
, integer-conversion:base
178+
, integer-logarithms:base
179+
, integer-logarithms:ghc-bignum
180+
, io-classes:base
181+
, io-classes:time
182+
, lens:containers
183+
, lens:free
184+
, lens:template-haskell
185+
, list-t:foldl
186+
, megaparsec:base
187+
, megaparsec:containers
188+
, megaparsec:transformers
189+
, microlens-th:containers
190+
, microlens-th:template-haskell
191+
, microstache:aeson
192+
, microstache:base
193+
, microstache:containers
194+
, microstache:unordered-containers
195+
, microstache:vector
196+
, monoidal-containers:base
197+
, monoidal-containers:containers
198+
, network-uri:th-compat
199+
, nonempty-vector:base
200+
, nothunks:containers
201+
, nothunks:time
202+
, nothunks:wherefrom-compat
203+
, ordered-containers:containers
204+
, os-string:template-haskell
205+
, parallel:base
206+
, parsec:text
207+
, plutus-core:dependent-map
208+
, plutus-core:microlens-th
209+
, primitive:base
210+
, process:base
211+
, process:unix
212+
, quickcheck-instances:QuickCheck
213+
, quickcheck-instances:base
214+
, quickcheck-instances:containers
215+
, ral:base
216+
, ral:boring
217+
, recursion-schemes:containers
218+
, recursion-schemes:template-haskell
219+
, scientific:base
220+
, scientific:containers
221+
, scientific:integer-logarithms
222+
, scientific:template-haskell
223+
, semialign:base
224+
, semialign:containers
225+
, semigroupoids:bifunctors
226+
, serialise:base
227+
, serialise:containers
228+
, serialise:ghc-prim
229+
, serialise:time
230+
, singletons:base
231+
, singletons-th:base
232+
, singletons-th:singletons
233+
, singletons-th:template-haskell
234+
, singletons-th:th-desugar
235+
, singletons-th:th-orphans
236+
, size-based:template-haskell
237+
, some:base
238+
, splitmix:base
239+
, statistics:parallel
240+
, tagged:base
241+
, tagged:template-haskell
242+
, tasty:base
243+
, tasty:tagged
244+
, tasty-golden:tasty
245+
, tasty-hedgehog:base
246+
, test-framework:time
247+
, text:binary
248+
, text:bytestring
249+
, text:template-haskell
250+
, text-iso8601:time
251+
, text-short:base
252+
, text-short:bytestring
253+
, text-short:ghc-prim
254+
, text-short:template-haskell
255+
, th-abstraction:template-haskell
256+
, th-compat:template-haskell
257+
, th-desugar:template-haskell
258+
, th-expand-syns:base
259+
, th-expand-syns:containers
260+
, th-expand-syns:template-haskell
261+
, th-lift:template-haskell
262+
, th-lift-instances:th-lift
263+
, th-orphans:template-haskell
264+
, these:base
265+
, time-compat:base
266+
, time-compat:deepseq
267+
, time-compat:time
268+
, transformers:base
269+
, tree-diff:QuickCheck
270+
, tree-diff:base
271+
, tree-diff:containers
272+
, tree-diff:time
273+
, turtle:containers
274+
, turtle:time
275+
, typed-process:async
276+
, universe-base:base
277+
, universe-base:containers
278+
, unix:time
279+
, unordered-containers:hashable
280+
, unordered-containers:template-haskell
281+
, uuid-types:template-haskell
282+
, vector-th-unbox:base
283+
, vector-th-unbox:template-haskell
284+
, wherefrom-compat:base
285+
, wherefrom-compat:ghc-heap
286+
, witherable:containers

‎plutus-core/plutus-core.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ executable plutus
734734
, singletons-th
735735
, text
736736
, text-zipper
737-
, vty ^>=6.2
737+
, vty ^>=6.5
738738
, vty-crossplatform ^>=0.4
739739

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

‎plutus-core/plutus-core/src/PlutusCore/Core/Instance/Eq.hs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
{-# OPTIONS_GHC -fno-warn-orphans #-}
55

6+
{-# LANGUAGE CPP #-}
67
{-# LANGUAGE FlexibleInstances #-}
78
{-# LANGUAGE RankNTypes #-}
89
{-# LANGUAGE TypeApplications #-}
@@ -51,9 +52,14 @@ deriving stock instance
5152
(GEq uni, Closed uni, uni `Everywhere` Eq, Eq ann) =>
5253
Eq (Type TyDeBruijn uni ann)
5354

54-
deriving stock instance (GEq uni, Closed uni, uni `Everywhere` Eq, Eq fun, Eq ann,
55-
Eq (Term tyname name uni fun ann)
56-
) => Eq (Program tyname name uni fun ann)
55+
deriving stock instance (
56+
#if __GLASGOW_HASKELL__ < 914
57+
-- These constraints are REQUIRED for ghc < 9.14 but REDUNDANT for ghc >= 9.14
58+
-- See https://gitlab.haskell.org/ghc/ghc/-/issues/26381#note_637863
59+
GEq uni, Closed uni, Eq fun,
60+
#endif
61+
uni `Everywhere` Eq, Eq ann,
62+
Eq (Term tyname name uni fun ann) ) => Eq (Program tyname name uni fun ann)
5763

5864
type EqRenameOf ren a = HasUniques a => a -> a -> EqRename ren
5965

‎plutus-core/plutus-core/src/PlutusCore/Error.hs‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE DeriveAnyClass #-}
23
{-# LANGUAGE FlexibleInstances #-}
34
{-# LANGUAGE FunctionalDependencies #-}
@@ -84,8 +85,13 @@ deriving stock instance
8485
deriving stock instance
8586
( Eq (Term tyname name uni fun ann)
8687
, Eq (Type tyname uni ann)
87-
, GEq uni, Closed uni, uni `Everywhere` Eq
88-
, Eq fun, Eq ann
88+
#if __GLASGOW_HASKELL__ < 914
89+
-- These constraints are REQUIRED for ghc < 9.14 but REDUNDANT for ghc >= 9.14
90+
-- See https://gitlab.haskell.org/ghc/ghc/-/issues/26381#note_637863
91+
, GEq uni, Closed uni
92+
, Eq fun
93+
#endif
94+
, uni `Everywhere` Eq, Eq ann
8995
) => Eq (NormCheckError tyname name uni fun ann)
9096

9197
-- | This is needed for nice kind/type checking error messages. In some cases the type checker knows
@@ -151,15 +157,33 @@ data Error uni fun ann
151157
deriving stock (Generic, Functor)
152158

153159
deriving stock instance
154-
(Eq fun, Eq ann, Closed uni, Everywhere uni Eq, GEq uni, Eq ParserError) =>
160+
(Eq fun, Eq ann, Closed uni, Everywhere uni Eq, GEq uni
161+
#if __GLASGOW_HASKELL__ < 914
162+
-- These constraints are REQUIRED for ghc < 9.14 but REDUNDANT for ghc >= 9.14
163+
-- See https://gitlab.haskell.org/ghc/ghc/-/issues/26381#note_637863
164+
, Eq ParserError
165+
#endif
166+
) =>
155167
Eq (Error uni fun ann)
156168

157169
deriving anyclass instance
158-
(NFData fun, NFData ann, Closed uni, Everywhere uni NFData, NFData ParserError) =>
170+
(NFData fun, NFData ann, Closed uni, Everywhere uni NFData
171+
#if __GLASGOW_HASKELL__ < 914
172+
-- These constraints are REQUIRED for ghc < 9.14 but REDUNDANT for ghc >= 9.14
173+
-- See https://gitlab.haskell.org/ghc/ghc/-/issues/26381#note_637863
174+
, NFData ParserError
175+
#endif
176+
) =>
159177
NFData (Error uni fun ann)
160178

161179
deriving stock instance
162-
(Show fun, Show ann, Closed uni, Everywhere uni Show, GShow uni, Show ParserError) =>
180+
(Show fun, Show ann, Closed uni, Everywhere uni Show, GShow uni
181+
#if __GLASGOW_HASKELL__ < 914
182+
-- These constraints are REQUIRED for ghc < 9.14 but REDUNDANT for ghc >= 9.14
183+
-- See https://gitlab.haskell.org/ghc/ghc/-/issues/26381#note_637863
184+
, Show ParserError
185+
#endif
186+
) =>
163187
Show (Error uni fun ann)
164188

165189
instance Pretty SourcePos where

‎plutus-core/untyped-plutus-core/src/UntypedPlutusCore/Core/Instance/Eq.hs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
-- editorconfig-checker-disable-file
22
{-# OPTIONS_GHC -fno-warn-orphans #-}
33

4+
{-# LANGUAGE CPP #-}
45
{-# LANGUAGE ConstraintKinds #-}
56
{-# LANGUAGE FlexibleInstances #-}
67
{-# LANGUAGE TypeOperators #-}
@@ -65,7 +66,13 @@ deriving stock instance
6566

6667
instance HashableTermConstraints uni fun ann => Hashable (Term DeBruijn uni fun ann)
6768

68-
deriving stock instance (GEq uni, Closed uni, uni `Everywhere` Eq, Eq fun, Eq ann,
69+
deriving stock instance (
70+
#if __GLASGOW_HASKELL__ < 914
71+
-- These constraints are REQUIRED for ghc < 9.14 but REDUNDANT for ghc >= 9.14
72+
-- See https://gitlab.haskell.org/ghc/ghc/-/issues/26381#note_637863
73+
GEq uni, Closed uni, Eq fun,
74+
#endif
75+
uni `Everywhere` Eq, Eq ann,
6976
Eq (Term name uni fun ann)
7077
) => Eq (Program name uni fun ann)
7178

‎plutus-tx/src/PlutusTx/BuiltinList.hs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
{-# LANGUAGE CPP #-}
2+
13
{-# OPTIONS_GHC -Wno-unrecognised-pragmas #-}
24

35
{-# HLINT ignore "Redundant if" #-}
@@ -285,9 +287,13 @@ reverse xs = revAppend xs empty
285287

286288
-- | Plutus Tx version of 'Data.List.zip' for 'BuiltinList'.
287289
_zip
288-
:: forall a b
289-
. (MkNil a, MkNil b)
290-
=> BuiltinList a
290+
:: forall a b .
291+
#if __GLASGOW_HASKELL__ < 914
292+
-- These constraints are REQUIRED for ghc < 9.14 but REDUNDANT for ghc >= 9.14
293+
-- See https://gitlab.haskell.org/ghc/ghc/-/issues/26381#note_637863
294+
(MkNil a, MkNil b) =>
295+
#endif
296+
BuiltinList a
291297
-> BuiltinList b
292298
-> BuiltinList (BuiltinPair a b)
293299
_zip = zipWith (curry BI.BuiltinPair)

‎plutus-tx/src/PlutusTx/Builtins/HasOpaque.hs‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,22 @@ instance MkNil BuiltinData
273273
instance MkNil BuiltinValue
274274
instance MkNil BuiltinBLS12_381_G1_Element
275275
instance MkNil BuiltinBLS12_381_G2_Element
276-
instance (MkNil a) => MkNil (BuiltinList a)
277-
instance (MkNil a, MkNil b) => MkNil (BuiltinPair a b)
276+
277+
instance
278+
#if __GLASGOW_HASKELL__ < 914
279+
-- This constraint is REQUIRED for ghc < 9.14 but REDUNDANT for ghc >= 9.14
280+
-- See https://gitlab.haskell.org/ghc/ghc/-/issues/26381#note_637863
281+
(MkNil a) =>
282+
#endif
283+
MkNil (BuiltinList a)
284+
285+
instance
286+
#if __GLASGOW_HASKELL__ < 914
287+
-- These constraints are REQUIRED for ghc < 9.14 but REDUNDANT for ghc >= 9.14
288+
-- See https://gitlab.haskell.org/ghc/ghc/-/issues/26381#note_637863
289+
(MkNil a, MkNil b) =>
290+
#endif
291+
MkNil (BuiltinPair a b)
278292

279293
instance (HasToOpaque a arep, MkNil arep) => HasToOpaque [a] (BuiltinList arep) where
280294
toOpaque = goList

‎plutus-tx/test/Show/Spec.hs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE GADTs #-}
23
{-# LANGUAGE OverloadedStrings #-}
34
{-# LANGUAGE TemplateHaskell #-}
45

6+
#if __GLASGOW_HASKELL__ >= 914
7+
-- Get a redundant constraint warning on `deriveShow`.
8+
-- The `Show` constraint is REQUIRED for ghc < 9.14 but REDUNDANT for ghc >= 9.14
9+
-- See https://gitlab.haskell.org/ghc/ghc/-/issues/26381#note_637863
10+
{-# OPTIONS_GHC -Wno-redundant-constraints #-}
11+
#endif
12+
513
module Show.Spec where
614

715
import PlutusTx.Bool

0 commit comments

Comments
 (0)