Fix GHC 9.6 build

IntersectMBO · Jul 25, 2023 · a7569ad · a7569ad
1 parent be025cb
commit a7569ad
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -17,7 +17,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2023-07-11"
+      CABAL_CACHE_VERSION: "2023-07-25_103-1"
 
     concurrency:
       group: >

diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -191,7 +191,7 @@ library cardano-cli-test-lib
                       , transformers
 
 test-suite cardano-cli-test
-  import:               project-config, maybe-unix
+  import:               project-config
 
   hs-source-dirs:       test/cardano-cli-test
   main-is:              cardano-cli-test.hs

diff --git a/cardano-cli/src/Cardano/CLI/Run/Legacy/Address.hs b/cardano-cli/src/Cardano/CLI/Run/Legacy/Address.hs
@@ -79,7 +79,7 @@ runAddressKeyGenToFile fmt kt vkf skf = case kt of
 
 generateAndWriteByronKeyFiles
   :: Key keyrole
-#if __GLASGOW_HASKELL__ >= 940
+#if __GLASGOW_HASKELL__ >= 902
 -- GHC 8.10 considers the HasTypeProxy constraint redundant but ghc-9.4 and above complains if its
 -- not present.
   => HasTypeProxy keyrole
@@ -93,7 +93,7 @@ generateAndWriteByronKeyFiles asType vkf skf = do
 
 generateAndWriteKeyFiles
   :: Key keyrole
-#if __GLASGOW_HASKELL__ >= 940
+#if __GLASGOW_HASKELL__ >= 902
 -- GHC 8.10 considers the HasTypeProxy constraint redundant but ghc-9.4 and above complains if its
 -- not present.
   => HasTypeProxy keyrole

diff --git a/cardano-cli/src/Cardano/CLI/Run/Legacy/Genesis.hs b/cardano-cli/src/Cardano/CLI/Run/Legacy/Genesis.hs
@@ -460,7 +460,7 @@ toSKeyJSON :: Key a => SigningKey a -> ByteString
 toSKeyJSON = LBS.toStrict . textEnvelopeToJSON Nothing
 
 toVkeyJSON ::
-#if __GLASGOW_HASKELL__ >= 940
+#if __GLASGOW_HASKELL__ >= 902
 -- GHC 8.10 considers the HasTypeProxy constraint redundant but ghc-9.4 and above complains if its
 -- not present.
               (Key a, HasTypeProxy a) =>

diff --git a/cardano-cli/src/Cardano/CLI/Types/Key.hs b/cardano-cli/src/Cardano/CLI/Types/Key.hs
@@ -207,7 +207,7 @@ readVerificationKeyOrHashOrTextEnvFile asType verKeyOrHashOrFile =
     VerificationKeyHash vkHash -> pure (Right vkHash)
 
 generateKeyPair ::
-#if __GLASGOW_HASKELL__ >= 940
+#if __GLASGOW_HASKELL__ >= 902
 -- GHC 8.10 considers the HasTypeProxy constraint redundant but ghc-9.4 and above complains if its
 -- not present.
     (Key keyrole, HasTypeProxy keyrole) =>