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

Make it build with ghc-9.6

Author: erikd

.github/workflows/haskell.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         cabal: ["3.10.1.0"]
-        ghc: ["8.10.7", "9.2.7"]
+        ghc: ["8.10.7", "9.2.7", "9.6.2" ]
         os: [ubuntu-latest, macos-latest]
 
     steps:
@@ -48,7 +48,7 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y libpq-dev libpq5 net-tools postgresql
-    
+
     - name: Post Install Cleanup (Linux)
       if: matrix.os == 'ubuntu-latest'
       run: |
@@ -122,7 +122,7 @@ jobs:
       run: cabal build all -j --ghc-option=-j4 --enable-tests --only-dependencies
 
     - name: Build
-      run: cabal build all -j --ghc-option=-j4 --enable-tests 
+      run: cabal build all -j --ghc-option=-j4 --enable-tests
 
     - name: Set up database user (Linux)
       if: matrix.os == 'ubuntu-latest'

cabal.project

@@ -10,8 +10,8 @@ repository cardano-haskell-packages
     d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
 
 index-state:
-  , hackage.haskell.org 2023-07-27T01:34:31Z
-  , cardano-haskell-packages 2023-07-27T07:20:05Z
+  , hackage.haskell.org 2023-08-09T22:19:16Z
+  , cardano-haskell-packages 2023-08-09T14:21:51Z
 
 packages:
   cardano-db
@@ -21,14 +21,6 @@ packages:
   cardano-smash-server
   cardano-chain-gen
 
-allow-newer:
-  text,
-  ekg-forward
-
-constraints:
-    persistent-postgresql >= 2.11.0.1,
-    optparse-applicative >= 0.16.0 && < 0.16.1
-
 package cardano-db
   ghc-options: -Wall -Werror -Wredundant-constraints -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -Wunused-imports -Wunused-packages
 
@@ -71,11 +63,17 @@ package snap-server
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/cardano-node
-  tag: 408d8ae10a2792ace3a822e312433960e47de4e9
-  --sha256: sha256-LF8whQABPpSkmyuJrTlK5barYuTiG609yGusHD0fDYQ=
+  tag: 8163a92d5c39f44ccdd3b9aeac55a30d52a8efb8
+  --sha256: 0mldj7khhafq8x0vhbm05lmzc1haag36wrkim36mkbcrhf8cxd2x
   subdir:
     cardano-git-rev
     cardano-node
     trace-dispatcher
     trace-forward
     trace-resources
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/persistent-documentation
+  tag: 0e95dbb144b02a2e6bf3a8a7531f4ad2f7d64ce5
+  --sha256: 0jylzv9s5rv58m9ny1zna2imqhr4yjgxl3i9rp7rir6xr93c30js

cardano-chain-gen/cardano-chain-gen.cabal

@@ -53,7 +53,7 @@ library
                         Cardano.Mock.Forging.Tx.Shelley
                         Cardano.Mock.Forging.Types
 
-  build-depends:        base                            >= 4.14         && < 4.17
+  build-depends:        base                            >= 4.14         && < 5
                       , async
                       , aeson
                       , binary
@@ -181,7 +181,7 @@ test-suite cardano-chain-gen
                         Test.Cardano.Db.Mock.Validate
 
   build-depends:        async
-                      , base                            >= 4.14         && < 4.17
+                      , base
                       , bytestring
                       , cardano-api
                       , cardano-crypto-class

cardano-chain-gen/src/Cardano/Mock/Forging/Tx/Generic.hs

@@ -4,6 +4,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE TypeOperators #-}
 
 module Cardano.Mock.Forging.Tx.Generic (
   allPoolStakeCert,

cardano-chain-gen/test/Test/Cardano/Db/Mock/Validate.hs

@@ -4,6 +4,7 @@
 {-# LANGUAGE NumericUnderscores #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeOperators #-}
 
 module Test.Cardano.Db.Mock.Validate (
   assertBlocksCount,

cardano-db-sync/cardano-db-sync.cabal

@@ -123,7 +123,7 @@ library
 
                         Paths_cardano_db_sync
 
-  build-depends:        base                            >= 4.14         && < 4.17
+  build-depends:        base                            >= 4.14         && < 5
                       , aeson
                       , async
                       , binary
@@ -171,7 +171,6 @@ library
                       , microlens
                       , monad-control
                       , monad-logger
-                      , mtl
                       , network-mux
                       , ouroboros-consensus
                       , ouroboros-consensus-cardano
@@ -227,7 +226,7 @@ executable cardano-db-sync
   other-modules:        Paths_cardano_db_sync
                         MigrationValidations
 
-  build-depends:        base                            >= 4.14         && < 4.17
+  build-depends:        base
                       , cardano-db
                       , cardano-db-sync
                       , cardano-prelude

cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Block.hs

@@ -1,11 +1,13 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE TypeOperators #-}
 
 module Cardano.DbSync.Era.Shelley.Generic.Block (
   Block (..),
@@ -38,6 +40,9 @@ import Cardano.Prelude
 import qualified Cardano.Protocol.TPraos.BHeader as TPraos
 import qualified Cardano.Protocol.TPraos.OCert as TPraos
 import Cardano.Slotting.Slot (SlotNo (..))
+#if __GLASGOW_HASKELL__ >= 906
+import Data.Type.Equality (type (~))
+#endif
 import Ouroboros.Consensus.Cardano.Block (
   StandardAllegra,
   StandardAlonzo,

cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/ParamProposal.hs

@@ -1,8 +1,9 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeOperators #-}
-{-# LANGUAGE NoImplicitPrelude #-}
 
 module Cardano.DbSync.Era.Shelley.Generic.ParamProposal (
   ParamProposal (..),
@@ -24,6 +25,9 @@ import qualified Cardano.Ledger.Shelley.PParams as Shelley
 import Cardano.Prelude
 import Cardano.Slotting.Slot (EpochNo (..))
 import qualified Data.Map.Strict as Map
+#if __GLASGOW_HASKELL__ >= 906
+import Data.Type.Equality (type (~))
+#endif
 import Lens.Micro ((^.))
 import Ouroboros.Consensus.Cardano.Block (StandardAlonzo, StandardBabbage)
 

cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/StakeDist.hs

@@ -1,11 +1,13 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
-{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE TypeOperators #-}
 
 module Cardano.DbSync.Era.Shelley.Generic.StakeDist (
   StakeSliceRes (..),
@@ -24,6 +26,9 @@ import Cardano.Ledger.Keys (KeyHash (..), KeyRole (..))
 import qualified Cardano.Ledger.Shelley.LedgerState as Shelley
 import Cardano.Prelude
 import qualified Data.Map.Strict as Map
+#if __GLASGOW_HASKELL__ >= 906
+import Data.Type.Equality (type (~))
+#endif
 import Data.VMap (VB, VMap (..), VP)
 import qualified Data.VMap as VMap
 import qualified Data.Vector.Generic as VG

cardano-db-sync/src/Cardano/DbSync/Era/Shelley/Generic/Tx/Allegra.hs

@@ -1,10 +1,12 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE NoImplicitPrelude #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE TypeOperators #-}
 
 module Cardano.DbSync.Era.Shelley.Generic.Tx.Allegra (
   fromAllegraTx,
@@ -40,6 +42,9 @@ import Cardano.Slotting.Slot (SlotNo (..))
 import qualified Data.Aeson as Aeson
 import qualified Data.ByteString.Lazy.Char8 as LBS
 import qualified Data.Map.Strict as Map
+#if __GLASGOW_HASKELL__ >= 906
+import Data.Type.Equality (type (~))
+#endif
 import Lens.Micro ((^.))
 import Ouroboros.Consensus.Cardano.Block (StandardAllegra, StandardCrypto)