Skip to content

Commit

Permalink
updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
nhenin committed Aug 2, 2024
1 parent 7838595 commit bd7b423
Show file tree
Hide file tree
Showing 19 changed files with 824 additions and 129 deletions.
8 changes: 1 addition & 7 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,9 @@ repository cardano-haskell-packages
c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

-- run `nix flake lock --update-input hackage` after updating the hackage index-state.
-- run `nix flake lock --update-input CHaP` after updating the cardano-haskell-packages index-state.
-- We duplicate the hackage index-state first for haskell.nix, even though cabal ignores it.
-- This must always match the hackage index-state on the next line.
-- See https://github.com/input-output-hk/haskell.nix/issues/1869#issuecomment-1449272480
index-state: 2024-06-23T23:01:13Z
index-state:
, hackage.haskell.org 2024-06-23T23:01:13Z
, cardano-haskell-packages 2024-07-03T01:26:49Z
, cardano-haskell-packages 2024-07-24T14:16:32Z

packages:
async-components
Expand Down
596 changes: 596 additions & 0 deletions cabal.project.freeze

Large diffs are not rendered by default.

74 changes: 37 additions & 37 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

marlowe-plutus.url = "github:input-output-hk/marlowe-plutus";

cardano-node.url = "github:input-output-hk/cardano-node?ref=9.0.0";
cardano-node.url = "github:input-output-hk/cardano-node?ref=9.1.0";

iogx = {
url = "github:input-output-hk/iogx";
Expand Down
2 changes: 0 additions & 2 deletions hie.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion libs/cardano-debug/cardano-debug.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ library
, aeson
, base >=4.9 && <5
, bytestring
, cardano-api ^>=9.0
, cardano-api ^>=9.1
, cardano-ledger-core
, cardano-ledger-shelley
, containers
Expand Down
9 changes: 6 additions & 3 deletions marlowe-apps/marlowe-apps.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ library
, async
, base >=4.9 && <5
, bytestring
, cardano-api ^>=9.0
, cardano-api ^>=9.1
, containers
, data-default
, eventuo11y >=0.9 && <0.11
Expand All @@ -40,7 +40,10 @@ library
, marlowe-chain-sync
, marlowe-client
, marlowe-protocols
, marlowe-runtime:{marlowe-runtime, config, sync-api, tx-api}
, marlowe-runtime
, marlowe-runtime:config
, marlowe-runtime:sync-api
, marlowe-runtime:tx-api
, mtl
, network
, optparse-applicative
Expand Down Expand Up @@ -96,7 +99,7 @@ executable marlowe-oracle
, base >=4.9 && <5
, base16-aeson
, bytestring
, cardano-api ^>=9.0
, cardano-api ^>=9.1
, eventuo11y >=0.9 && <0.11
, eventuo11y-dsl ^>=0.2
, eventuo11y-json ^>=0.3.0.3
Expand Down
18 changes: 9 additions & 9 deletions marlowe-benchmark/example/sanchonet/pod-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
- mountPath: /var/lib/postgresql/data
name: pg-db
- name: node
image: ghcr.io/intersectmbo/cardano-node:9.0.0
image: ghcr.io/intersectmbo/cardano-node:9.1.0
command:
- /usr/local/bin/entrypoint
env:
Expand All @@ -58,7 +58,7 @@ spec:
- mountPath: /data/db
name: node-db
- name: chain-indexer
image: docker.io/library/marlowe-chain-indexer:conway-cardano-9.0.0
image: docker.io/library/marlowe-chain-indexer:conway-cardano-9.1.0
depends_on:
- node
env:
Expand All @@ -82,7 +82,7 @@ spec:
- mountPath: /data/db
name: node-db
- name: chain-sync
image: docker.io/library/marlowe-chain-sync:conway-cardano-9.0.0
image: docker.io/library/marlowe-chain-sync:conway-cardano-9.1.0
depends_on:
- node
env:
Expand Down Expand Up @@ -119,7 +119,7 @@ spec:
- mountPath: /ipc
name: shared
- name: marlowe-indexer
image: docker.io/library/marlowe-indexer:conway-cardano-9.0.0
image: docker.io/library/marlowe-indexer:conway-cardano-9.1.0
depends_on:
- chain-sync
env:
Expand All @@ -140,7 +140,7 @@ spec:
- name: HTTP_PORT
value: 3783
- name: marlowe-sync
image: docker.io/library/marlowe-sync:conway-cardano-9.0.0
image: docker.io/library/marlowe-sync:conway-cardano-9.1.0
env:
- name: MARLOWE_CHAIN_SYNC_HOST
value: benchmark-sanchonet
Expand Down Expand Up @@ -176,7 +176,7 @@ spec:
# - hostPort: 3730
# containerPort: 3730
- name: contract
image: docker.io/library/marlowe-contract:conway-cardano-9.0.0
image: docker.io/library/marlowe-contract:conway-cardano-9.1.0
env:
- name: HOST
value: benchmark-sanchonet
Expand Down Expand Up @@ -209,7 +209,7 @@ spec:
- mountPath: /store
name: contracts
- name: tx
image: docker.io/library/marlowe-tx:conway-cardano-9.0.0
image: docker.io/library/marlowe-tx:conway-cardano-9.1.0
depends_on:
- chain-sync
env:
Expand All @@ -235,7 +235,7 @@ spec:
# - hostPort: 3723
# containerPort: 3723
- name: proxy
image: docker.io/library/marlowe-proxy:conway-cardano-9.0.0
image: docker.io/library/marlowe-proxy:conway-cardano-9.1.0
depends_on:
- marlowe-sync
- tx
Expand Down Expand Up @@ -279,7 +279,7 @@ spec:
- hostPort: 37012
containerPort: 3701
- name: web-server
image: docker.io/library/marlowe-web-server:conway-cardano-9.0.0
image: docker.io/library/marlowe-web-server:conway-cardano-9.1.0
depends_on:
- proxy
env:
Expand Down
Loading

0 comments on commit bd7b423

Please sign in to comment.