Integration work for node 8.7.0

.github/workflows/haskell.yml

@@ -20,7 +20,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2023-09-27"
+      CABAL_CACHE_VERSION: "2023-11-17"
 
     concurrency:
       group: >

cabal.project

@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2023-08-08T19:56:09Z
-  , cardano-haskell-packages 2023-11-10T12:47:36Z
+  , hackage.haskell.org 2023-11-09T23:50:15Z
+  , cardano-haskell-packages 2023-11-17T15:33:21Z
 
 packages:
   cardano-cli
@@ -43,9 +43,3 @@ write-ghc-environment-files: always
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
-
-source-repository-package
-  type: git
-  location: https://github.com/input-output-hk/cardano-api
-  tag: b406ef1e24a3da86b53a2f51384d47672ff7ab18
-  subdir: cardano-api

cardano-cli/cardano-cli.cabal

@@ -206,7 +206,7 @@ library
                       , binary
                       , bytestring
                       , canonical-json
-                      , cardano-api ^>= 8.31.0.0
+                      , cardano-api ^>= 8.33.0.0
                       , cardano-binary
                       , cardano-crypto
                       , cardano-crypto-class ^>= 2.1.2

cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs

@@ -2980,9 +2980,9 @@ pMinCommitteeSize =
     , Opt.help "TODO"
     ]
 
-pCommitteeTermLength :: Parser Natural
+pCommitteeTermLength :: Parser EpochNo
 pCommitteeTermLength =
-  Opt.option Opt.auto $ mconcat
+  fmap EpochNo $ Opt.option Opt.auto $ mconcat
     [ Opt.long "committee-term-length"
     , Opt.metavar "INT"
     , Opt.help "TODO"

cardano-cli/src/Cardano/CLI/Types/Output.hs

@@ -158,11 +158,11 @@ data QueryTipLocalStateOutput = QueryTipLocalStateOutput
   } deriving Show
 
 -- | A key-value pair difference list for encoding a JSON object.
-(..=) :: (KeyValue kv, ToJSON v) => Aeson.Key -> v -> [kv] -> [kv]
+(..=) :: (KeyValue e kv, ToJSON v) => Aeson.Key -> v -> [kv] -> [kv]
 (..=) n v = (n .= v:)
 
 -- | A key-value pair difference list for encoding a JSON object where Nothing encodes absence of the key-value pair.
-(..=?) :: (KeyValue kv, ToJSON v) => Aeson.Key -> Maybe v -> [kv] -> [kv]
+(..=?) :: (KeyValue e kv, ToJSON v) => Aeson.Key -> Maybe v -> [kv] -> [kv]
 (..=?) n mv = case mv of
   Just v -> (n .= v:)
   Nothing -> id