From da1078db3eff6615f7ef91086585e1d30c1b9bf4 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Tue, 24 Jan 2023 15:12:16 +1100 Subject: [PATCH 1/2] Add constraints and update CHaP --- cabal.project | 71 +++++++++++++++++++++++++++++++++++++++++---------- flake.lock | 6 ++--- 2 files changed, 61 insertions(+), 16 deletions(-) diff --git a/cabal.project b/cabal.project index dc900b0361a..284c9d07b50 100644 --- a/cabal.project +++ b/cabal.project @@ -12,8 +12,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: 2022-09-27T00:00:00Z -index-state: cardano-haskell-packages 2022-10-25T20:00:00Z +index-state: 2022-09-27T18:00:00Z +index-state: cardano-haskell-packages 2023-01-26T18:00:00Z packages: cardano-api @@ -88,28 +88,74 @@ constraints: , algebraic-graphs < 0.7 , protolude < 0.3.1 -- TODO: these should be set in cabal files, but avoiding setting them in lower dependencies for initial CHaP release - , cardano-prelude == 0.1.0.0 + , ap-normalize == 0.1.0.1 , base-deriving-via == 0.1.0.0 - , cardano-binary == 1.5.0 + , byron-spec-chain == 0.1.0.0 + , byron-spec-ledger == 0.1.0.0 + , cardano-binary == 1.5.0 , cardano-binary-test == 1.3.0 - , cardano-crypto-class == 2.0.0.0.1 - , cardano-crypto-praos == 2.0.0.0.1 - , cardano-crypto-tests == 2.0.0.0.1 - , cardano-slotting == 0.1.0.0 + , cardano-crypto-class == 2.0.0.0.1 + , cardano-crypto-praos == 2.0.0.0.1 + , cardano-crypto-test == 1.3.0 + , cardano-crypto-tests == 2.0.0.0.1 + , cardano-crypto-wrapper == 1.3.0 + , cardano-data == 0.1.0.1 + , cardano-ledger-alonzo == 0.1.0.0 + , cardano-ledger-babbage == 0.1.0.0 + , cardano-ledger-byron == 0.1.0.0 + , cardano-ledger-byron-test == 1.3.0 + , cardano-ledger-core == 0.1.0.0 + , cardano-ledger-pretty == 0.1.0.0 + , cardano-ledger-shelley == 0.1.0.0 + , cardano-ledger-shelley-ma == 0.1.0.0 + , cardano-ledger-shelley-test == 0.1.0.0 + , cardano-prelude == 0.1.0.0 + , cardano-prelude-test == 0.1.0.1 + , cardano-protocol-tpraos == 0.1.0.0 + , cardano-slotting == 0.1.0.0 + , contra-tracer == 0.1.0.0 + , ekg-forward == 0.1.0 + , generic-monoid == 0.1.0.1 + , goblins == 0.2.0.0 + , iohk-monitoring ==0.1.11.0 + , lobemo-backend-aggregation == 0.1.0.0 + , lobemo-backend-ekg == 0.1.0.1 + , lobemo-backend-monitoring == 0.1.0.0 + , lobemo-backend-trace-forwarder == 0.1.0.0 + , lobemo-scribe-systemd == 0.1.0.0 , measures == 0.1.0.0 + , monoidal-synchronisation == 0.1.0.1 + , network-mux == 0.1.0.1 + , non-integral == 0.1.0.0 , orphans-deriving-via == 0.1.0.0 - , strict-containers == 0.1.0.0 + , ouroboros-consensus == 0.1.0.1 + , ouroboros-consensus-byron == 0.1.0.1 + , ouroboros-consensus-cardano == 0.1.0.1 + , ouroboros-consensus-protocol == 0.1.0.1 + , ouroboros-consensus-shelley == 0.1.0.1 + , ouroboros-network == 0.1.0.1 + , ouroboros-network-framework == 0.1.0.1 + , ouroboros-network-testing == 0.1.0.1 , plutus-core == 1.0.0.1 + , plutus-ghc-stub == 8.6.5 , plutus-ledger-api == 1.0.0.1 , plutus-tx == 1.0.0.0 , plutus-tx-plugin == 1.0.0.0 , prettyprinter-configurable == 0.1.0.0 - , plutus-ghc-stub == 8.6.5 - , word-array == 0.1.0.0 + , set-algebra == 0.1.0.0 + , small-steps == 0.1.0.0 + , small-steps-test == 0.1.0.0 + , strict-containers == 0.1.0.0 + , tracer-transformers == 0.1.0.1 + , typed-protocols == 0.1.0.0 + , typed-protocols-cborg == 0.1.0.0 + , vector-map == 0.1.0.0 + , Win32-network == 0.1.0.0 + , wl-pprint-annotated == 0.1.0.1 , word-array == 0.1.0.0 extra-packages: - ouroboros-consensus-cardano-tools == 0.1.0.0 + ouroboros-consensus-cardano-tools == 0.1.0.1 package snap-server flags: +openssl @@ -148,4 +194,3 @@ source-repository-package location: https://github.com/denisshevchenko/threepenny-gui tag: 4ec92ded05ccf59ba4a874be4b404ac1b6d666b6 --sha256: 00fvvaf4ir4hskq4a6gggbh2wmdvy8j8kn6s4m1p1vlh8m8mq514 - diff --git a/flake.lock b/flake.lock index ad0c7c6730c..71aae9b6e42 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1666726035, - "narHash": "sha256-EBodp9DJb8Z+aVbuezVwLJ9Q9XIJUXFd/n2skay3FeU=", + "lastModified": 1674756171, + "narHash": "sha256-edcHqVXXg11ueHMYhUzA4Cp9FgrhV/IbvA4XCB8DwFU=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "b074321c4c8cbf2c3789436ab11eaa43e1c441a7", + "rev": "bedbed3bcca19ef64b8a776bceeea052c2b69ea5", "type": "github" }, "original": { From f8141bcecb3e5830b9fe0423588b709a92851c38 Mon Sep 17 00:00:00 2001 From: Samuel Leathers Date: Thu, 26 Jan 2023 13:26:43 -0500 Subject: [PATCH 2/2] bump version to 1.35.5 --- bench/cardano-topology/cardano-topology.cabal | 2 +- cardano-api/cardano-api.cabal | 2 +- cardano-cli/cardano-cli.cabal | 2 +- cardano-node-chairman/cardano-node-chairman.cabal | 2 +- cardano-node/cardano-node.cabal | 2 +- cardano-testnet/cardano-testnet.cabal | 2 +- cardano-tracer/cardano-tracer.cabal | 2 +- docker-compose.yml | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bench/cardano-topology/cardano-topology.cabal b/bench/cardano-topology/cardano-topology.cabal index 7da25d5bd67..a52a6819416 100644 --- a/bench/cardano-topology/cardano-topology.cabal +++ b/bench/cardano-topology/cardano-topology.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 name: cardano-topology -version: 1.35.4 +version: 1.35.5 description: A cardano topology generator author: IOHK maintainer: operations@iohk.io diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal index 6b091fe331f..b99d7c81d3a 100644 --- a/cardano-api/cardano-api.cabal +++ b/cardano-api/cardano-api.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 name: cardano-api -version: 1.35.4 +version: 1.35.5 description: The cardano api author: IOHK maintainer: operations@iohk.io diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index df541416ff5..f2740e19fdf 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 name: cardano-cli -version: 1.35.4 +version: 1.35.5 description: The Cardano command-line interface. author: IOHK maintainer: operations@iohk.io diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal index ed42d01b5ca..c72e48f6230 100644 --- a/cardano-node-chairman/cardano-node-chairman.cabal +++ b/cardano-node-chairman/cardano-node-chairman.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 name: cardano-node-chairman -version: 1.35.4 +version: 1.35.5 description: The cardano full node author: IOHK maintainer: operations@iohk.io diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 5f8507b766c..82d5236b7be 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 name: cardano-node -version: 1.35.4 +version: 1.35.5 description: The cardano full node author: IOHK maintainer: operations@iohk.io diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal index eb65f1c3633..40907603c39 100644 --- a/cardano-testnet/cardano-testnet.cabal +++ b/cardano-testnet/cardano-testnet.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 name: cardano-testnet -version: 1.35.4 +version: 1.35.5 description: The cardano full node author: IOHK maintainer: operations@iohk.io diff --git a/cardano-tracer/cardano-tracer.cabal b/cardano-tracer/cardano-tracer.cabal index 4d81fa46a6f..a23b3ac8513 100644 --- a/cardano-tracer/cardano-tracer.cabal +++ b/cardano-tracer/cardano-tracer.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: cardano-tracer -version: 1.35.4 +version: 1.35.5 synopsis: A service for logging and monitoring over Cardano nodes. description: See README for more info license: Apache-2.0 diff --git a/docker-compose.yml b/docker-compose.yml index 2b063876ce5..acaaf23074f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.5" services: cardano-node: - image: inputoutput/cardano-node:${CARDANO_NODE_VERSION:-1.35.4} + image: inputoutput/cardano-node:${CARDANO_NODE_VERSION:-1.35.5} environment: - NETWORK=${NETWORK:-mainnet} volumes: @@ -15,7 +15,7 @@ services: max-file: "10" cardano-submit-api: - image: inputoutput/cardano-submit-api:${CARDANO_SUBMIT_API_VERSION:-1.35.4} + image: inputoutput/cardano-submit-api:${CARDANO_SUBMIT_API_VERSION:-1.35.5} environment: - NETWORK=${NETWORK:-mainnet} depends_on: