Make it build with ghc 9.12 (#1406)

jasagredo · web-flow · commit 43c1fef4631d · 2025-03-13T09:55:34.000Z
# Description

Make it build with ghc 9.12
Also note that:

- New code should be properly tested (even if it does not add new
features).
- The fix for a regression should include a test that reproduces said
regression.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10.7", "9.6.6", "9.10.1"]
+        ghc: ["8.10.7", "9.6.6", "9.10.1", "9.12"]
         variant: [default, no-thunks]
         test-set: [all, no-thunks-safe]
         exclude:
diff --git a/cabal.project b/cabal.project
@@ -14,9 +14,9 @@ repository cardano-haskell-packages
 -- update either of these.
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2024-12-10T16:20:07Z
+  , hackage.haskell.org 2025-02-27T18:46:10Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2025-02-04T06:43:15Z
+  , cardano-haskell-packages 2025-02-28T01:28:51Z
 
 packages:
   ouroboros-consensus
@@ -44,3 +44,25 @@ package ouroboros-network
 if(os(windows))
   constraints:
     bitvec -simd
+
+if impl (ghc >= 9.12)
+  allow-newer:
+    -- https://github.com/phadej/vec/issues/118
+    , bin:base
+    , fin:base
+    , ral:base
+
+    -- https://github.com/well-typed/cborg/pull/339
+    , cborg:base
+    , cborg:ghc-prim
+    , serialise:base
+    , serialise:ghc-prim
+
+    -- https://github.com/haskellari/tree-diff/issues/97
+    , tree-diff:base
+
+    -- https://github.com/kapralVV/Unique/issues/11
+    , Unique:hashable
+
+    -- https://github.com/fizruk/http-api-data/pull/146
+    , http-api-data:base
diff --git a/ouroboros-consensus-cardano/changelog.d/20250228_145946_erikd_ghc_9_12.md b/ouroboros-consensus-cardano/changelog.d/20250228_145946_erikd_ghc_9_12.md
@@ -0,0 +1,4 @@
+### Non-Breaking
+
+- Bump upper bound on `base` dependency.
+
diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal
@@ -124,7 +124,7 @@ library
     Ouroboros.Consensus.Shelley.ShelleyHFC
 
   build-depends:
-    base >=4.14 && <4.21,
+    base >=4.14 && <4.22,
     base-deriving-via,
     bytestring >=0.10 && <0.13,
     cardano-binary,
@@ -188,7 +188,7 @@ library unstable-byronspec
     Ouroboros.Consensus.ByronSpec.Ledger.Rules
 
   build-depends:
-    base >=4.14 && <4.21,
+    base >=4.14 && <4.22,
     bimap >=0.4 && <0.6,
     byron-spec-chain,
     byron-spec-ledger,
@@ -513,7 +513,7 @@ library unstable-cardano-tools
 
   build-depends:
     aeson,
-    base >=4.14 && <4.21,
+    base >=4.14 && <4.22,
     base16-bytestring >=1.0,
     bytestring >=0.10 && <0.13,
     cardano-crypto,
diff --git a/ouroboros-consensus-diffusion/changelog.d/20250228_145946_erikd_ghc_9_12.md b/ouroboros-consensus-diffusion/changelog.d/20250228_145946_erikd_ghc_9_12.md
@@ -0,0 +1,4 @@
+### Non-Breaking
+
+- Bump upper bound on `base` dependency.
+
diff --git a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal
@@ -77,7 +77,7 @@ library
     Ouroboros.Consensus.Node.Run,
 
   build-depends:
-    base >=4.14 && <4.21,
+    base >=4.14 && <4.22,
     bytestring >=0.10 && <0.13,
     cardano-slotting,
     cborg ^>=0.2.2,
diff --git a/ouroboros-consensus-protocol/changelog.d/20250228_145946_erikd_ghc_9_12.md b/ouroboros-consensus-protocol/changelog.d/20250228_145946_erikd_ghc_9_12.md
@@ -0,0 +1,4 @@
+### Non-Breaking
+
+- Bump upper bound on `base` dependency.
+
diff --git a/ouroboros-consensus-protocol/ouroboros-consensus-protocol.cabal b/ouroboros-consensus-protocol/ouroboros-consensus-protocol.cabal
@@ -63,7 +63,7 @@ library
     Ouroboros.Consensus.Protocol.TPraos
 
   build-depends:
-    base >=4.14 && <4.21,
+    base >=4.14 && <4.22,
     bytestring,
     cardano-binary,
     cardano-crypto-class,
diff --git a/ouroboros-consensus/changelog.d/20250228_145842_erikd_ghc_9_12.md b/ouroboros-consensus/changelog.d/20250228_145842_erikd_ghc_9_12.md
@@ -0,0 +1,6 @@
+### Non-Breaking
+
+- Remove redundant derived Typeable instances.
+
+- Bump upper bound on `base` dependency.
+
diff --git a/ouroboros-consensus/ouroboros-consensus.cabal b/ouroboros-consensus/ouroboros-consensus.cabal
@@ -270,7 +270,7 @@ library
     Ouroboros.Consensus.Util.Versioned
 
   build-depends:
-    base >=4.14 && <4.21,
+    base >=4.14 && <4.22,
     base-deriving-via,
     base16-bytestring,
     bimap >=0.4 && <0.6,
diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/API.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Storage/ChainDB/API.hs
@@ -805,7 +805,6 @@ data ChainDbFailure blk =
     --
     -- Thrown when we are not sure in which DB the block /should/ have been.
   | ChainDbMissingBlock (RealPoint blk)
-  deriving (Typeable)
 
 deriving instance StandardHash blk => Show (ChainDbFailure blk)
 
@@ -849,7 +848,6 @@ data ChainDbError blk =
     -- * The bounds don't make sense, e.g., the lower bound starts after the
     --   upper bound, or the lower bound starts from genesis, /inclusive/.
   | InvalidIteratorRange (StreamFrom blk) (StreamTo blk)
-  deriving (Typeable)
 
 deriving instance (Typeable blk, StandardHash blk) => Show (ChainDbError blk)
 
diff --git a/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/TestBlock.hs b/ouroboros-consensus/src/unstable-consensus-testlib/Test/Util/TestBlock.hs
@@ -183,7 +183,7 @@ import           Test.Util.Orphans.ToExpr ()
 newtype TestHash = UnsafeTestHash {
       unTestHash :: NonEmpty Word64
     }
-  deriving stock    (Generic, Typeable)
+  deriving stock    (Generic)
   deriving newtype  (Eq, Ord, Serialise, ToExpr)
   deriving anyclass (NoThunks)
 
diff --git a/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/TestBlock.hs b/ouroboros-consensus/test/storage-test/Test/Ouroboros/Storage/TestBlock.hs
@@ -78,7 +78,6 @@ import qualified Data.List.NonEmpty as NE
 import qualified Data.Map.Strict as Map
 import           Data.Maybe (maybeToList)
 import           Data.TreeDiff
-import           Data.Typeable (Typeable)
 import           Data.Word
 import           GHC.Generics (Generic)
 import           GHC.Stack (HasCallStack)
@@ -127,7 +126,7 @@ data TestBlock = TestBlock {
       testHeader :: !TestHeader
     , testBody   :: !TestBody
     }
-  deriving stock    (Show, Eq, Generic, Typeable)
+  deriving stock    (Show, Eq, Generic)
   deriving anyclass (NoThunks, Serialise)
 
 -- | Hash of a 'TestHeader'
diff --git a/sop-extras/changelog.d/20250228_145946_erikd_ghc_9_12.md b/sop-extras/changelog.d/20250228_145946_erikd_ghc_9_12.md
@@ -0,0 +1,4 @@
+### Non-Breaking
+
+- Bump upper bound on `base` dependency.
+
diff --git a/sop-extras/sop-extras.cabal b/sop-extras/sop-extras.cabal
@@ -47,7 +47,7 @@ library
     Data.SOP.Telescope
 
   build-depends:
-    base >=4.14 && <4.21,
+    base >=4.14 && <4.22,
     constraints ^>=0.14,
     nothunks ^>=0.2,
     sop-core ^>=0.5,
diff --git a/strict-sop-core/changelog.d/20250228_145946_erikd_ghc_9_12.md b/strict-sop-core/changelog.d/20250228_145946_erikd_ghc_9_12.md
@@ -0,0 +1,4 @@
+### Non-Breaking
+
+- Bump upper bound on `base` dependency.
+
diff --git a/strict-sop-core/strict-sop-core.cabal b/strict-sop-core/strict-sop-core.cabal
@@ -37,7 +37,7 @@ library
     Data.SOP.Strict.NS
 
   build-depends:
-    base >=4.14 && <4.21,
+    base >=4.14 && <4.22,
     nothunks ^>=0.2,
     sop-core ^>=0.5,
 

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +### Non-Breaking
++
 +- Bump upper bound on `base` dependency.
++
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ import Test.Util.Orphans.ToExpr ()`
`183`	`183`	`newtype TestHash = UnsafeTestHash {`
`184`	`184`	`unTestHash :: NonEmpty Word64`
`185`	`185`	`}`
`186`		`- deriving stock (Generic, Typeable)`
	`186`	`+ deriving stock (Generic)`
`187`	`187`	`deriving newtype (Eq, Ord, Serialise, ToExpr)`
`188`	`188`	`deriving anyclass (NoThunks)`
`189`	`189`