Make it build with ghc-9.6

Co-Authored: Nadia Yvette Chambers <nadia.chambers@iohk.io>

Author: erikd

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

bench/locli/src/Cardano/Analysis/BlockProp.hs

@@ -35,6 +35,7 @@ import Data.Set                 qualified as Set
 import Data.Text                qualified as T
 import Data.Text.Short          (toText)
 import Data.Tuple               (swap)
+import Data.Tuple.Extra         (both, fst3, snd3, thd3)
 import Data.Vector              (Vector)
 import Data.Vector              qualified as Vec
 

bench/locli/src/Cardano/Command.hs

@@ -15,6 +15,7 @@ import Data.Text                        qualified as T
 import Data.Text.Lazy                   qualified as LT
 import Data.Text.Short                  (toText)
 import Data.Time.Clock
+import Data.Tuple.Extra                 (both)
 import Options.Applicative
 import Options.Applicative              qualified as Opt
 

bench/locli/src/Cardano/Render.hs

@@ -1,5 +1,6 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE TypeOperators #-}
 
 {- HLINT ignore "Use concatMap" -}
 {- HLINT ignore "Use fromMaybe" -}
@@ -14,6 +15,9 @@ import Data.List                        (dropWhileEnd)
 import Data.Map.Strict                  qualified as Map
 import Data.Text                        qualified as T
 import Data.Text.Lazy                   qualified as LT
+#if __GLASGOW_HASKELL__ >= 906
+import Data.Type.Equality               (type (~))
+#endif
 import Options.Applicative              qualified as Opt
 
 import Data.CDF
@@ -22,7 +26,6 @@ import Cardano.Org
 import Cardano.Util
 import Cardano.Analysis.API
 
-
 data RenderConfig
   = RenderConfig
   { rcFormat          :: RenderFormat
@@ -361,7 +364,7 @@ renderAnalysisCDFs a fieldSelr _c2a centileSelr rc@RenderConfig{rcFormat=AsOrg}
     , tExtended       = True
     , tApexHeader     = Just "centile"
     , tColumns        = fields' <&> fmap (T.intercalate ":") . renderFieldCentiles x cdfSamplesProps
-    , tRowHeaders     = percSpecs <&> T.take 6 . T.pack . printf "%.4f" . unCentile
+    , tRowHeaders     = percSpecs <&> (T.take 6 . T.pack . printf "%.4f") . unCentile
     , tSummaryHeaders = ["avg", "samples"]
     , tSummaryValues  = [ fields' <&>
                           \f@Field{..} ->

bench/locli/src/Cardano/Report.hs

@@ -1,7 +1,8 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE PolyKinds #-}
 {-# LANGUAGE GeneralisedNewtypeDeriving #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# LANGUAGE TypeInType #-}
 {-# OPTIONS_GHC -Wno-orphans #-}
 module Cardano.Report
   ( module Cardano.Report
@@ -24,6 +25,7 @@ import System.Environment (lookupEnv)
 import Text.EDE hiding (Id)
 
 import Data.CDF
+import Data.Tuple.Extra (fst3)
 import Cardano.Util
 import Cardano.Analysis.API
 import Cardano.Analysis.Summary