Merge pull request #32 from input-output-hk/erikd/ghc-9.6

Make it compile with ghc-9.6

Author: erikd

.github/workflows/haskell.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10.7", "9.2.7", "9.4.4"]
+        ghc: ["8.10.7", "9.2.7", "9.4.4", "9.6.1"]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     env:

cabal.project

@@ -11,8 +11,8 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-  , hackage.haskell.org 2023-04-18T18:49:22Z
-  , cardano-haskell-packages 2023-03-30T14:04:13Z
+  , hackage.haskell.org 2023-05-03T10:02:50Z
+  , cardano-haskell-packages 2023-04-24T15:33:00Z
 
 packages: ./typed-protocols
           ./typed-protocols-cborg

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

@@ -21,7 +21,7 @@ cabal-version:       >=1.10
 library
   exposed-modules:   Network.TypedProtocol.Codec.CBOR
 
-  build-depends:     base            >=4.12  && <4.18,
+  build-depends:     base            >=4.12  && <4.20,
                      bytestring      >=0.10  && <0.12,
                      cborg           >=0.2.1 && <0.3,
 

typed-protocols-examples/src/Network/TypedProtocol/Driver/Simple.hs

@@ -6,7 +6,6 @@
 {-# LANGUAGE RankNTypes           #-}
 {-# LANGUAGE ScopedTypeVariables  #-}
 {-# LANGUAGE TypeFamilies         #-}
-{-# LANGUAGE TypeInType           #-}
 -- @UndecidableInstances@ extensions is required for defining @Show@ instance
 -- of @'TraceSendRecv'@.
 {-# LANGUAGE UndecidableInstances #-}

typed-protocols-examples/src/Network/TypedProtocol/ReqResp/Codec.hs

@@ -3,8 +3,8 @@
 {-# LANGUAGE GADTs               #-}
 {-# LANGUAGE KindSignatures      #-}
 {-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE PolyKinds           #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeInType          #-}
 
 module Network.TypedProtocol.ReqResp.Codec where
 

typed-protocols/src/Network/TypedProtocol/Codec.hs

@@ -7,7 +7,6 @@
 {-# LANGUAGE RankNTypes            #-}
 {-# LANGUAGE ScopedTypeVariables   #-}
 {-# LANGUAGE TypeFamilies          #-}
-{-# LANGUAGE TypeInType            #-}
 -- @UndecidableInstances@ extension is required for defining @Show@ instance of
 -- @'AnyMessage'@ and @'AnyMessageAndAgency'@.
 {-# LANGUAGE UndecidableInstances  #-}

typed-protocols/src/Network/TypedProtocol/Core.hs

@@ -8,7 +8,6 @@
 {-# LANGUAGE RankNTypes            #-}
 {-# LANGUAGE StandaloneDeriving    #-}
 {-# LANGUAGE TypeFamilies          #-}
-{-# LANGUAGE TypeInType            #-}
 
 
 -- | This module defines the core of the typed protocol framework.

typed-protocols/src/Network/TypedProtocol/Driver.hs

@@ -1,11 +1,12 @@
 {-# LANGUAGE BangPatterns        #-}
+{-# LANGUAGE DataKinds           #-}
 {-# LANGUAGE EmptyCase           #-}
 {-# LANGUAGE GADTs               #-}
 {-# LANGUAGE NamedFieldPuns      #-}
+{-# LANGUAGE PolyKinds           #-}
 {-# LANGUAGE RankNTypes          #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies        #-}
-{-# LANGUAGE TypeInType          #-}
 
 -- | Actions for running 'Peer's with a 'Driver'
 --

typed-protocols/src/Network/TypedProtocol/Proofs.hs

@@ -5,7 +5,6 @@
 {-# LANGUAGE RecordWildCards     #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeFamilies        #-}
-{-# LANGUAGE TypeInType          #-}
 
 
 -- This is already implied by the -Wall in the .cabal file, but lets just be