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

Make it build with ghc-9.6

Author: erikd

.github/workflows/github-page.yml

@@ -22,7 +22,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2023-07-11"
+      CABAL_CACHE_VERSION: "2023-07-27"
 
       # Modify this value to "invalidate" the secp cache.
       SECP_CACHE_VERSION: "2022-12-30"

.github/workflows/haskell-linux.yml

@@ -31,7 +31,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2023-07-11"
+      CABAL_CACHE_VERSION: "2023-07-27"
 
       # Modify this value to "invalidate" the secp cache.
       SECP_CACHE_VERSION: "2022-12-30"

.github/workflows/haskell.yml

@@ -25,13 +25,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["9.2.7"]
+        ghc: ["9.2.7", "9.6.2"]
         cabal: ["3.10.1.0"]
         os: [macos-latest, windows-latest]
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2023-07-11"
+      CABAL_CACHE_VERSION: "2023-07-27"
 
       # Modify this value to "invalidate" the secp cache.
       SECP_CACHE_VERSION: "2022-12-30"

.github/workflows/stylish-haskell.yml

@@ -27,7 +27,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2023-07-11"
+      CABAL_CACHE_VERSION: "2023-07-27"
 
       STYLISH_HASKELL_VERSION: "0.14.4.0"
 

bench/cardano-topology/cardano-topology.cabal

@@ -15,7 +15,7 @@ license-files:          LICENSE
 build-type:             Simple
 
 common project-config
-  build-depends:        base >= 4.14 && < 4.17
+  build-depends:        base >= 4.14 && < 5
   default-language:     Haskell2010
   default-extensions:   NoImplicitPrelude
   ghc-options:          -Wall

bench/locli/locli.cabal

@@ -18,6 +18,7 @@ common project-config
   default-language:     Haskell2010
   default-extensions:   BangPatterns
                         BlockArguments
+                        DataKinds
                         DeriveGeneric
                         DerivingStrategies
                         DerivingVia
@@ -38,7 +39,6 @@ common project-config
                         TupleSections
                         TypeApplications
                         TypeFamilies
-                        TypeInType
                         ViewPatterns
 
   ghc-options:          -Wall
@@ -49,7 +49,7 @@ common project-config
                         -Wcompat
                         -Wno-all-missed-specialisations
 
-  build-depends:        base >= 4.14 && < 4.17,
+  build-depends:        base >= 4.14 && < 5,
 
   if os(windows)
     buildable: False

bench/locli/src/Cardano/Analysis/API/Field.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 module Cardano.Analysis.API.Field (module Cardano.Analysis.API.Field) where
 

bench/locli/src/Cardano/Analysis/API/Ground.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE GeneralisedNewtypeDeriving #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
@@ -67,7 +68,7 @@ instance ToJSONKey Hash where
 instance FromJSONKey Hash where
   fromJSONKey = FromJSONKeyText (Hash . fromText)
 
-newtype Count a = Count { unCount :: Int }
+newtype Count (a :: k) = Count { unCount :: Int }
   deriving (Eq, Generic, Ord, Show)
   deriving newtype (Divisible, FromJSON, Num, Real, ToJSON)
   deriving anyclass NFData

bench/locli/src/Cardano/Analysis/API/Metrics.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE EmptyDataDeriving #-}
 {-# LANGUAGE GeneralisedNewtypeDeriving #-}
 {-# LANGUAGE UndecidableInstances #-}

bench/locli/src/Cardano/Analysis/API/Types.hs

@@ -1,8 +1,8 @@
+{-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE GeneralisedNewtypeDeriving #-}
 {-# LANGUAGE QuantifiedConstraints #-}
 {-# LANGUAGE UndecidableInstances #-}
-{-# LANGUAGE TypeInType #-}
 {-# LANGUAGE TypeSynonymInstances #-}
 {-# OPTIONS_GHC -Wno-name-shadowing -Wno-orphans #-}
 module Cardano.Analysis.API.Types (module Cardano.Analysis.API.Types) where