Merge pull request #70 from input-output-hk/erikd/ghc-9.12

Support ghc-9.12

Author: erikd

cabal.project

@@ -11,8 +11,8 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-    hackage.haskell.org 2024-08-27T18:06:30Z
-  , cardano-haskell-packages 2024-07-24T14:16:32Z
+    hackage.haskell.org 2025-01-30T00:54:30Z
+  , cardano-haskell-packages 2025-01-29T20:54:25Z
 
 packages: ./typed-protocols
           ./typed-protocols-cborg
@@ -22,3 +22,11 @@ packages: ./typed-protocols
           -- ./typed-protocols-doc
 
 test-show-details: direct
+
+if impl (ghc >= 9.12)
+  allow-newer:
+    -- https://github.com/well-typed/cborg/pull/339
+    , cborg:base
+    , cborg:ghc-prim
+    , serialise:base
+    , serialise:ghc-prim

typed-protocols-cborg/typed-protocols-cborg.cabal

@@ -18,7 +18,7 @@ extra-doc-files:     CHANGELOG.md, README.md
 library
   exposed-modules:   Network.TypedProtocol.Codec.CBOR
 
-  build-depends:     base             >=4.12  && <4.21,
+  build-depends:     base             >=4.12  && <4.22,
                      bytestring       >=0.10  && <0.13,
                      cborg            >=0.2.1 && <0.3,
                      singletons,        

typed-protocols-doc/demo/DemoProtocol.hs

@@ -80,10 +80,10 @@ instance Codec (DemoCodec a) where
   type MonadDecode (DemoCodec a) = Except String
 
 data PongEnum = NormalPong | ComplexPong
-  deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
+  deriving (Show, Read, Eq, Ord, Enum, Bounded)
 
 data PingEnum = PingRequest | EndPing
-  deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
+  deriving (Show, Read, Eq, Ord, Enum, Bounded)
 
 deriving via (ViaEnum PongEnum)
   instance (Codec codec, HasInfo codec (DefEnumEncoding codec)) => HasInfo codec PongEnum

typed-protocols-doc/test/Network/TypedProtocol/Tests/TestProtocol.hs

@@ -80,10 +80,10 @@ instance Codec (TestCodec a) where
   type MonadDecode (TestCodec a) = Except String
 
 data PongEnum = NormalPong | ComplexPong
-  deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
+  deriving (Show, Read, Eq, Ord, Enum, Bounded)
 
 data PingEnum = PingRequest | EndPing
-  deriving (Show, Read, Eq, Ord, Enum, Bounded, Typeable)
+  deriving (Show, Read, Eq, Ord, Enum, Bounded)
 
 deriving via (ViaEnum PongEnum)
   instance (Codec codec, HasInfo codec (DefEnumEncoding codec)) => HasInfo codec PongEnum

typed-protocols-stateful-cborg/typed-protocols-stateful-cborg.cabal

@@ -20,7 +20,7 @@ extra-doc-files:     CHANGELOG.md, README.md
 library
   exposed-modules:   Network.TypedProtocol.Stateful.Codec.CBOR
 
-  build-depends:     base            >=4.12  && <4.21,
+  build-depends:     base            >=4.12  && <4.22,
                      bytestring      >=0.10  && <0.13,
                      cborg           >=0.2.1 && <0.3,
                      singletons,