Preliminary ghc-9.14 support

Currently using ghc-9.14.0.20251007.

Author: erikd

acts-generic/src/Data/Act/Generic.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                   #-}
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE FlexibleInstances     #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
@@ -68,7 +69,13 @@ instance (GAct s f, GAct s g) => GAct s (f :+: g) where
 --
 newtype GenericAct s a = GenericAct { getGenericAct :: a }
 
-instance (Generic s, Generic a, GAct s (Rep a), Semigroup s) => Act s (GenericAct s a) where
+instance (
+#if __GLASGOW_HASKELL__ < 914
+  -- These constraints are REQUIRED for ghc < 9.14 but REDUNDANT for ghc >= 9.14
+  -- See https://gitlab.haskell.org/ghc/ghc/-/issues/26381#note_637863
+  Generic s, 
+#endif
+  Generic a, GAct s (Rep a), Semigroup s) => Act s (GenericAct s a) where
   act s (GenericAct a) = GenericAct (s `gact` a)
 
 

cabal.project

@@ -62,3 +62,154 @@ source-repository-package
   tag: 6d0f51fba415d3c641a8a8da37130e7adfc3ea01
   --sha256: sha256-qM8RgmKOGBMlizPtXw2YOboYIzM6T3kvG9/Rp1F+bYQ=
   subdir: kes-agent-crypto
+
+if impl (ghc >= 9.14)
+  constraints:
+    , containers > 0.7
+    , foldl >= 1.4.18
+    , nothunks ^>= 0.2
+    -- Newest version causes Arbitrary instance clashes in quickcheck-instances.
+    , QuickCheck < 2.17.0.0
+
+-- cabal-allow-newer
+if impl (ghc >= 9.14)
+  allow-newer:
+    , OneTuple:base
+    , aeson:QuickCheck
+    , aeson:base
+    , aeson:bytestring
+    , aeson:containers
+    , aeson:deepseq
+    , aeson:ghc-prim
+    , aeson:template-haskell
+    , aeson:text-iso8601
+    , aeson:text-short
+    , aeson:time
+    , aeson:time-compat
+    , aeson:witherable
+    , assoc:base
+    , async:base
+    , bifunctors:template-haskell
+    , bifunctors:th-abstraction
+    , binary:containers
+    , binary-orphans:base
+    , boring:base
+    , canonical-json:containers
+    , cardano-diffusion:cborg
+    , cardano-diffusion:io-classes
+    , cardano-diffusion:typed-protocols
+    , cardano-ping:time
+    , cardano-prelude:canonical-json
+    , cborg:base
+    , cborg:bytestring
+    , cborg:containers
+    , criterion:microstache
+    , data-fix:base
+    , directory:time
+    , dmq-node:time
+    , exceptions:mtl
+    , filepath:base
+    , free:base
+    , free:exceptions
+    , free:mtl
+    , free:template-haskell
+    , generic-data:base
+    , generically:base
+    , ghc-heap:base
+    , ghc-heap:containers
+    , ghc-heap:ghc-internal
+    , ghc-heap:ghc-prim
+    , hashable:base
+    , hashable:containers
+    , hashable:ghc-bignum
+    , hsc2hs:base
+    , indexed-traversable:base
+    , indexed-traversable:containers
+    , indexed-traversable-instances:base
+    , integer-conversion:base
+    , integer-logarithms:base
+    , integer-logarithms:ghc-bignum
+    , io-classes:async
+    , io-classes:base
+    , io-classes:time
+    , io-sim:base
+    , io-sim:time
+    , kes-agent-crypto:base
+    , microstache:aeson
+    , microstache:base
+    , microstache:bytestring
+    , microstache:containers
+    , network-mux:containers
+    , network-mux:time
+    , network-uri:th-compat
+    , nothunks:containers
+    , nothunks:time
+    , nothunks:wherefrom-compat
+    , ntp-client:time
+    , os-string:bytestring
+    , os-string:exceptions
+    , os-string:template-haskell
+    , ouroboros-network:time
+    , parallel:base
+    , parsec:bytestring
+    , primitive:base
+    , process:base
+    , quickcheck-instances:array
+    , quickcheck-instances:base
+    , quickcheck-instances:bytestring
+    , quickcheck-instances:containers
+    , recursion-schemes:containers
+    , recursion-schemes:data-fix
+    , recursion-schemes:free
+    , recursion-schemes:template-haskell
+    , scientific:base
+    , scientific:containers
+    , scientific:integer-logarithms
+    , scientific:template-haskell
+    , semialign:base
+    , semialign:containers
+    , semigroupoids:bifunctors
+    , serialise:base
+    , serialise:bytestring
+    , serialise:containers
+    , serialise:ghc-prim
+    , serialise:hashable
+    , serialise:these
+    , serialise:time
+    , singletons:base
+    , splitmix:base
+    , statistics:parallel
+    , tagged:template-haskell
+    , tdigest:base
+    , text:array
+    , text:binary
+    , text-iso8601:time
+    , text-short:base
+    , text-short:ghc-prim
+    , text-short:template-haskell
+    , th-abstraction:template-haskell
+    , th-compat:template-haskell
+    , these:base
+    , time-compat:base
+    , time-compat:deepseq
+    , time-compat:time
+    , tree-diff:aeson
+    , tree-diff:base
+    , tree-diff:containers
+    , tree-diff:deepseq
+    , tree-diff:scientific
+    , tree-diff:tagged
+    , tree-diff:time
+    , tree-diff:uuid-types
+    , typed-protocols:base
+    , typed-protocols:singletons
+    , unix:base
+    , unordered-containers:base
+    , unordered-containers:hashable
+    , unordered-containers:template-haskell
+    , uuid-types:template-haskell
+    , vector-th-unbox:base
+    , vector-th-unbox:template-haskell
+    , wherefrom-compat:base
+    , with-utf8:base
+    , witherable:containers

cardano-diffusion/tests/lib/Test/Cardano/Network/PeerSelection.hs

@@ -1079,7 +1079,11 @@ prop_governor_peershare_1hr env@GovernorMockEnvironment {
                        )
      in counterexample ( intercalate "\n"
                        . map (ppSimEvent 20 20 20)
-                       . takeWhile (\e -> seTime e <= Time (60*60))
+                       . takeWhile (\e ->
+                            case e of
+                              SimEvent    {seTime} -> seTime < Time (60*60)
+                              SimPOREvent {seTime} -> seTime < Time (60*60)
+                              _                    -> False)
                        . Trace.toList
                        $ ioSimTrace) $
         subsetProperty    found reachable

cardano-ping/cardano-ping.cabal

@@ -37,7 +37,7 @@ library
     network-mux ^>=0.9,
     tdigest ^>=0.3,
     text >=1.2.4 && <2.2,
-    time >=1.9.1 && <1.16,
+    time >=1.9.1 && <1.14,
     transformers >=0.5 && <0.7,
 
   if flag(asserts)

dmq-node/dmq-node.cabal

@@ -107,7 +107,7 @@ library
     random ^>=1.2,
     singletons,
     text >=1.2.4 && <2.2,
-    time >=1.12 && <1.16,
+    time ^>=1.12,
     typed-protocols:{typed-protocols, cborg} ^>=1.1,
 
   hs-source-dirs: src

network-mux/src/Network/Mux.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE BangPatterns              #-}
+{-# LANGUAGE CPP                       #-}
 {-# LANGUAGE DataKinds                 #-}
 {-# LANGUAGE ExistentialQuantification #-}
 {-# LANGUAGE FlexibleContexts          #-}
@@ -66,7 +67,11 @@ import Data.Map (Map)
 import Data.Map.Strict qualified as Map
 import Data.Maybe (isNothing)
 import Data.Monoid.Synchronisation (FirstToFinish (..))
+#if __GLASGOW_HASKELL__ < 914
 import Data.Strict.Tuple (pattern (:!:))
+#else
+import Data.Strict.Tuple (data (:!:))
+#endif
 
 import Control.Applicative
 import Control.Concurrent.Class.MonadSTM.Strict

network-mux/src/Network/Mux/Ingress.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE BangPatterns          #-}
+{-# LANGUAGE CPP                   #-}
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE NamedFieldPuns        #-}
@@ -17,7 +18,11 @@ import Data.ByteString.Builder.Internal (lazyByteStringInsert,
            lazyByteStringThreshold)
 import Data.ByteString.Lazy qualified as BL
 import Data.List (nub)
+#if __GLASGOW_HASKELL__ < 914
 import Data.Strict.Tuple (pattern (:!:))
+#else
+import Data.Strict.Tuple (data (:!:))
+#endif
 
 import Control.Concurrent.Class.MonadSTM.Strict
 import Control.Monad

ntp-client/ntp-client.cabal

@@ -36,7 +36,7 @@ library
     contra-tracer >=0.1 && <0.2,
     network ^>=3.2.7,
     stm >=2.4 && <2.6,
-    time >=1.9.1 && <1.16,
+    time >=1.9.1 && <1.14,
 
   hs-source-dirs: src
   default-language: Haskell2010
@@ -67,7 +67,7 @@ test-suite test
     binary >=0.8 && <0.11,
     tasty,
     tasty-quickcheck,
-    time >=1.9.1 && <1.16,
+    time >=1.9.1 && <1.14,
 
   default-language: Haskell2010
   default-extensions: ImportQualifiedPost

ouroboros-network/api/lib/Ouroboros/Network/Block.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                        #-}
 {-# LANGUAGE DeriveAnyClass             #-}
 {-# LANGUAGE DeriveGeneric              #-}
 {-# LANGUAGE DeriveTraversable          #-}
@@ -40,8 +41,13 @@ module Ouroboros.Network.Block
   , pointHash
   , castPoint
   , blockPoint
+#if __GLASGOW_HASKELL__ < 914
   , pattern GenesisPoint
   , pattern BlockPoint
+#else
+  , data GenesisPoint
+  , data BlockPoint
+#endif
   , atSlot
   , withHash
   , Tip (..)

ouroboros-network/api/tests/Test/Ouroboros/Network/Chain.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP              #-}
 {-# LANGUAGE DataKinds        #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs            #-}
@@ -15,7 +16,13 @@ import Test.QuickCheck
 import Test.Tasty (TestTree, testGroup)
 import Test.Tasty.QuickCheck (testProperty)
 
-import Ouroboros.Network.Block (blockPrevHash, pattern GenesisPoint, pointHash)
+import Ouroboros.Network.Block (blockPrevHash,
+#if __GLASGOW_HASKELL__ < 914
+       pattern GenesisPoint,
+#else
+       data GenesisPoint,
+#endif
+       pointHash)
 import Ouroboros.Network.Mock.Chain (Chain (..))
 import Ouroboros.Network.Mock.Chain qualified as Chain
 import Ouroboros.Network.Mock.ChainGenerators hiding (tests)