Fix nix compilation issues

IntersectMBO · Jul 20, 2023 · 2cb249d · 2cb249d
1 parent 2e3a3e5
commit 2cb249d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10.7", "9.2.7"]
+        ghc: ["8.10.7", "9.2.7", "9.6.2"]
         cabal: ["3.10.1.0"]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
@@ -48,14 +48,14 @@ jobs:
       with:
         ghc-version: ${{ matrix.ghc }}
         cabal-version: ${{ matrix.cabal }}
-  
+
     - name: Install system dependencies
       uses: input-output-hk/actions/base@latest
       with:
         use-sodium-vrf: true # default is true
 
     - uses: actions/checkout@v3
-  
+
     - name: Cabal update
       run: cabal update
 

diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -111,7 +111,6 @@ library
                       , bytestring
                       , canonical-json
                       , cardano-api ^>= 8.8.1
-                      , cardano-api:internal ^>= 8.8.1
                       , cardano-binary
                       , cardano-crypto
                       , cardano-crypto-class >= 2.1.1

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

diff --git a/cardano-cli/src/Cardano/CLI/Run/Legacy/Genesis.hs b/cardano-cli/src/Cardano/CLI/Run/Legacy/Genesis.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE ConstraintKinds #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DeriveGeneric #-}
@@ -458,7 +459,15 @@ runGenesisCreate
 toSKeyJSON :: Key a => SigningKey a -> ByteString
 toSKeyJSON = LBS.toStrict . textEnvelopeToJSON Nothing
 
-toVkeyJSON :: (Key a, HasTypeProxy a) => SigningKey a -> ByteString
+toVkeyJSON ::
+#if __GLASGOW_HASKELL__ >= 940
+-- GHC 8.10 considers the HasTypeProxy constraint redundant but ghc-9.4 and above complains if its
+-- not present.
+              (Key a, HasTypeProxy a) =>
+#else
+              (Key a) =>
+#endif
+              SigningKey a -> ByteString
 toVkeyJSON = LBS.toStrict . textEnvelopeToJSON Nothing . getVerificationKey
 
 toVkeyJSON' :: Key a => VerificationKey a -> ByteString

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