Integration work for node 8.7.0

cabal.project

@@ -13,7 +13,7 @@ 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
+  , hackage.haskell.org 2023-11-10T00:00:00Z
   , cardano-haskell-packages 2023-11-10T12:47:36Z
 
 packages:
@@ -40,6 +40,68 @@ test-show-details: direct
 -- Always write GHC env files, because they are needed for ghci.
 write-ghc-environment-files: always
 
+constraints:
+  -- Plutus is incompatible with 0.1.5 because of the NoThunks (Identity a)
+  -- instance, once they fix that we shall remove this constraint.
+  nothunks == 0.1.4
+
 -- 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/ouroboros-consensus
+  tag: 9d6a9de9a46a68a9d748969002131328d6600a40
+  --sha256: 1s19vfwkvq8346k2yj59dahmkc5nxq0nwzrhi8rbli8qyi25qayi
+  subdir:
+    ouroboros-consensus
+    ouroboros-consensus-cardano
+    ouroboros-consensus-protocol
+    ouroboros-consensus-diffusion
+    sop-extras
+    strict-sop-core
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-ledger
+  tag: f85ec6f2e0a80101009187f79ff154ab33a82a21
+  --sha256: 192jn0q73020qmvv0hzk11ai7sm7p2yd66qkhdyp5niffrwybzkr
+  subdir:
+    eras/allegra/impl
+    eras/alonzo/impl
+    eras/alonzo/test-suite
+    eras/babbage/impl
+    eras/babbage/test-suite
+    eras/conway/impl
+    eras/conway/test-suite
+    eras/mary/impl
+    eras/shelley/impl
+    eras/shelley/test-suite
+    eras/shelley-ma/test-suite
+    libs/cardano-ledger-api
+    libs/cardano-ledger-core
+    libs/cardano-ledger-binary
+    libs/cardano-ledger-pretty
+    libs/cardano-protocol-tpraos
+    libs/non-integral
+    libs/small-steps
+    libs/small-steps-test
+    libs/cardano-data
+    libs/set-algebra
+    libs/vector-map
+    eras/byron/chain/executable-spec
+    eras/byron/ledger/executable-spec
+    eras/byron/ledger/impl
+    eras/byron/ledger/impl/test
+    eras/byron/crypto
+    eras/byron/crypto/test
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/cardano-api
+  tag: 537e1a26ea9a4ab82d8170305d09ffb350bc3828
+  --sha256: 1qw1dbd1lqwlj8kabj6kbzzi82na1l855dpzjgfp75r437n3yjzc
+  subdir:
+    cardano-api
+    cardano-api-gen

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

@@ -2966,9 +2966,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

@@ -157,11 +157,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