Skip to content

Commit 6181867

Browse files
authored
Merge pull request #768 from IntersectMBO/erikd/ghc-9.12
Make it build with ghc 9.12
2 parents 7b5cd90 + 54a9ba9 commit 6181867

File tree

7 files changed

+98
-221
lines changed

7 files changed

+98
-221
lines changed

.github/workflows/haskell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
ghc: ["8.10.7", "9.6", "9.10"]
23+
ghc: ["8.10.7", "9.6", "9.12"]
2424
cabal: ["3.14"]
2525
sys:
2626
- { os: windows-latest, shell: 'C:/msys64/usr/bin/bash.exe -e {0}' }

cabal.project

Lines changed: 24 additions & 2 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-12-24T12:56:48Z
17-
, cardano-haskell-packages 2025-02-11T21:18:23Z
16+
, hackage.haskell.org 2025-03-03T01:12:46Z
17+
, cardano-haskell-packages 2025-03-03T04:46:42Z
1818

1919
packages:
2020
cardano-api
@@ -51,3 +51,25 @@ semaphore: True
5151
-- IMPORTANT
5252
-- Do NOT add more source-repository-package stanzas here unless they are strictly
5353
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.
54+
55+
if impl (ghc >= 9.12)
56+
allow-newer:
57+
-- https://github.com/phadej/vec/issues/118
58+
, bin:base
59+
, fin:base
60+
, ral:base
61+
62+
-- https://github.com/well-typed/cborg/pull/339
63+
, cborg:base
64+
, cborg:ghc-prim
65+
, serialise:base
66+
, serialise:ghc-prim
67+
68+
-- https://github.com/haskellari/tree-diff/issues/97
69+
, tree-diff:base
70+
71+
-- https://github.com/kapralVV/Unique/issues/11
72+
, Unique:hashable
73+
74+
-- https://github.com/fizruk/http-api-data/pull/146
75+
, http-api-data:base

cardano-api-gen/cardano-api-gen.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ extra-doc-files:
2424
common project-config
2525
default-language: Haskell2010
2626
default-extensions: OverloadedStrings
27-
build-depends: base >=4.14 && <4.21
27+
build-depends: base >=4.14 && <4.22
2828
ghc-options:
2929
-Wall
3030
-Wcompat

cardano-api/cardano-api.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ common project-config
2626
ImportQualifiedPost
2727
OverloadedStrings
2828

29-
build-depends: base >=4.14 && <4.21
29+
build-depends: base >=4.14 && <4.22
3030
ghc-options:
3131
-Wall
3232
-Wcompat

cardano-api/src/Cardano/Api/Internal/Script.hs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ import Data.Text (Text)
174174
import Data.Text qualified as Text
175175
import Data.Text.Encoding qualified as Text
176176
import Data.Type.Equality (TestEquality (..), (:~:) (Refl))
177-
import Data.Typeable (Typeable)
178177
import Data.Vector (Vector)
179178
import Formatting qualified as B
180179
import GHC.Exts (IsList (..))
@@ -1517,8 +1516,6 @@ deriving instance Eq (ReferenceScript era)
15171516

15181517
deriving instance Show (ReferenceScript era)
15191518

1520-
deriving instance Typeable (ReferenceScript era)
1521-
15221519
instance IsCardanoEra era => ToJSON (ReferenceScript era) where
15231520
toJSON (ReferenceScript _ s) = object ["referenceScript" .= s]
15241521
toJSON ReferenceScriptNone = Aeson.Null

0 commit comments

Comments
 (0)