From 04b8141420da8f7379535dcd261b1f77c6ebed97 Mon Sep 17 00:00:00 2001 From: KtorZ Date: Wed, 1 Jul 2020 17:41:57 +0200 Subject: [PATCH 1/5] Bump cardano-node to include a fix on non-myopic member reward ordering --- snapshot.yaml | 23 +++++++++++++++++++++++ stack.yaml | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 snapshot.yaml diff --git a/snapshot.yaml b/snapshot.yaml new file mode 100644 index 00000000000..5b88847e404 --- /dev/null +++ b/snapshot.yaml @@ -0,0 +1,23 @@ +name: _ +resolver: https://raw.githubusercontent.com/input-output-hk/cardano-haskell/633f6141c3e7211dbb0c6ae6ad50d4976313e190/snapshots/cardano-1.14.2.yaml +packages: +- git: https://github.com/input-output-hk/cardano-node + commit: a2161bac700fac55d2400b37f9935ed8ea527550 + subdirs: + - cardano-api + - cardano-cli + - cardano-config + - cardano-node +- git: https://github.com/input-output-hk/cardano-ledger-specs + commit: 0294e7edd67a77c41dfdf4cd47af23dbefea0d9b + subdirs: + - byron/ledger/impl + - byron/crypto + - byron/ledger/impl/test + - byron/crypto/test + - byron/chain/executable-spec + - byron/ledger/executable-spec + - semantics/executable-spec + - shelley/chain-and-ledger/dependencies/non-integer + - shelley/chain-and-ledger/executable-spec + - shelley/chain-and-ledger/executable-spec/test diff --git a/stack.yaml b/stack.yaml index 152d56ead54..0941ce89a60 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: https://raw.githubusercontent.com/input-output-hk/cardano-haskell/633f6141c3e7211dbb0c6ae6ad50d4976313e190/snapshots/cardano-1.14.2.yaml +resolver: snapshot.yaml packages: - lib/core - lib/core-integration From d064a2b6e15a9866158b778112601254392e1e68 Mon Sep 17 00:00:00 2001 From: KtorZ Date: Thu, 2 Jul 2020 10:25:02 +0200 Subject: [PATCH 2/5] update compatibility matrix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a71f9f77063..5dd98cf1977 100644 --- a/README.md +++ b/README.md @@ -70,7 +70,7 @@ See **Installation Instructions** for each available [release](https://github.co > > | cardano-wallet | jörmungandr (compatible versions) | cardano-node (compatible versions) > | --- | --- | --- -> | `master` branch | [v0.8.18](https://github.com/input-output-hk/jormungandr/releases/tag/v0.8.18) | [1.14.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.14.1) +> | `master` branch | [v0.9.0](https://github.com/input-output-hk/jormungandr/releases/tag/v0.9.0) | [a2161bac70](https://github.com/input-output-hk/cardano-node/commit/a2161bac700fac55d2400b37f9935ed8ea527550) > | [v2020-06-05](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-06-05) | [v0.8.18](https://github.com/input-output-hk/jormungandr/releases/tag/v0.8.18) | [1.13.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.13.0) > | [v2020-05-06](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-05-06) | [v0.8.18](https://github.com/input-output-hk/jormungandr/releases/tag/v0.8.18) | [1.11.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.11.0) > | [v2020-04-28](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2020-04-28) | [v0.8.18](https://github.com/input-output-hk/jormungandr/releases/tag/v0.8.18) | [1.11.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.11.0) From 67865c9ed6f5ba068cca1bea5ae17d38c0b3a8a8 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 3 Jul 2020 17:59:56 +1000 Subject: [PATCH 3/5] Also bump cardano-node in niv Matches revision in snapshot.yaml. I can fix it later so that the cardano-node rev is defined in only one place, in the stack snapshot. --- nix/sources.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/sources.json b/nix/sources.json index 2c9c3b73032..5a1da80a671 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,14 @@ { "cardano-node": { - "branch": "1.14.2", + "branch": "release/1.14.x", "description": null, "homepage": null, "owner": "input-output-hk", "repo": "cardano-node", - "rev": "924a6f7d8c2bdb1bf525be8b0d5626e440697b01", - "sha256": "0bi1vwmb1w6wc2szpr8v1nbsci9y36lnjr4v5pli1wvll1hhpw3c", + "rev": "a2161bac700fac55d2400b37f9935ed8ea527550", + "sha256": "1yjfh82ikp9g5prxdcfgg0ni8lgy1k45p8hxk8dc736qgbc495pm", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-node/archive/924a6f7d8c2bdb1bf525be8b0d5626e440697b01.tar.gz", + "url": "https://github.com/input-output-hk/cardano-node/archive/a2161bac700fac55d2400b37f9935ed8ea527550.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "haskell.nix": { From c5719173e4795be0e10d3f0c6452ff4db9e0def7 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Fri, 3 Jul 2020 18:11:45 +1000 Subject: [PATCH 4/5] Unfortunately stack-to-nix does not support recursive snapshot URLs --- cardano-1.14.x.yaml | 146 +++++++++++++++++++ nix/.stack.nix/byron-spec-chain.nix | 4 +- nix/.stack.nix/byron-spec-ledger.nix | 4 +- nix/.stack.nix/cardano-api.nix | 4 +- nix/.stack.nix/cardano-cli.nix | 4 +- nix/.stack.nix/cardano-config.nix | 4 +- nix/.stack.nix/cardano-crypto-test.nix | 4 +- nix/.stack.nix/cardano-crypto-wrapper.nix | 4 +- nix/.stack.nix/cardano-ledger-test.nix | 4 +- nix/.stack.nix/cardano-ledger.nix | 4 +- nix/.stack.nix/cardano-node.nix | 4 +- nix/.stack.nix/default.nix | 95 +----------- nix/.stack.nix/shelley-spec-ledger-test.nix | 4 +- nix/.stack.nix/shelley-spec-ledger.nix | 4 +- nix/.stack.nix/shelley-spec-non-integral.nix | 4 +- nix/.stack.nix/small-steps.nix | 4 +- snapshot.yaml | 23 --- stack.yaml | 3 +- 18 files changed, 181 insertions(+), 142 deletions(-) create mode 100644 cardano-1.14.x.yaml delete mode 100644 snapshot.yaml diff --git a/cardano-1.14.x.yaml b/cardano-1.14.x.yaml new file mode 100644 index 00000000000..cf2f9ead39e --- /dev/null +++ b/cardano-1.14.x.yaml @@ -0,0 +1,146 @@ +name: cardano-1.14.x + +resolver: lts-14.25 + +packages: +- base16-0.1.2.1 +- base58-bytestring-0.1.0 +- base64-0.4.1 +- bimap-0.4.0 +- binary-0.8.7.0 +- brick-0.47 +- canonical-json-0.6.0.0 +- clock-0.8 +- config-ini-0.2.4.0 +- connection-0.3.1 +- containers-0.5.11.0 +- data-clist-0.1.2.2 +- dns-3.0.4 +- generic-monoid-0.1.0.0 +- generics-sop-0.5.1.0 +- gray-code-0.3.1 +- hedgehog-1.0.2 +- hspec-2.7.0 +- hspec-core-2.7.0 +- hspec-discover-2.7.0 +- io-streams-1.5.1.0 +- io-streams-haproxy-1.0.1.0 +- katip-0.8.4.0 +- libsystemd-journal-1.4.4 +- micro-recursion-schemes-5.0.2.2 +- moo-1.2 +- network-3.1.1.1 +- prometheus-2.1.2 +- quickcheck-instances-0.3.19 +- QuickCheck-2.12.6.1 +- quiet-0.2 +- snap-core-1.0.4.1 +- snap-server-1.1.1.1 +- sop-core-0.5.0.1 +- statistics-linreg-0.3 +- streaming-binary-0.3.0.1 +- systemd-2.3.0 +- tasty-hedgehog-1.0.0.2 +- text-1.2.4.0 +- text-zipper-0.10.1 +- th-lift-instances-0.1.14 +- time-units-1.0.0 +- transformers-except-0.1.1 +- Unique-0.4.7.6 +- websockets-0.12.6.1 +- Win32-2.6.2.0 +- word-wrap-0.4.1 + +- git: https://github.com/input-output-hk/cardano-base + commit: 5e0b8bc8c7862be12da6989440f8644ba7c1e1cf + subdirs: + - binary + - binary/test + - cardano-crypto-class + - slotting + - cardano-crypto-praos + +- git: https://github.com/input-output-hk/cardano-crypto + commit: 2547ad1e80aeabca2899951601079408becbc92c + +- git: https://github.com/input-output-hk/cardano-ledger-specs + commit: 0294e7edd67a77c41dfdf4cd47af23dbefea0d9b + subdirs: + - byron/ledger/impl + - byron/crypto + - byron/ledger/impl/test + - byron/crypto/test + - byron/chain/executable-spec + - byron/ledger/executable-spec + - semantics/executable-spec + - shelley/chain-and-ledger/dependencies/non-integer + - shelley/chain-and-ledger/executable-spec + - shelley/chain-and-ledger/executable-spec/test + +- git: https://github.com/input-output-hk/cardano-node + commit: a2161bac700fac55d2400b37f9935ed8ea527550 + subdirs: + - cardano-api + - cardano-cli + - cardano-config + - cardano-node + +- git: https://github.com/input-output-hk/cardano-prelude + commit: 316c854d1d3089f480708ad5cd5ecf8a74423ddd + subdirs: + - . + - test + +- git: https://github.com/input-output-hk/cardano-shell + commit: 601bb4324c258e3c8cbd2d532e5696fd09e2582e + subdirs: + - cardano-shell + +- git: https://github.com/input-output-hk/cardano-sl-x509 + commit: 43a036c5bbe68ca2e9cbe611eab7982e2348fe49 + +- git: https://github.com/input-output-hk/goblins + commit: 26d35ad52fe9ade3391532dbfeb2f416f07650bc + +- git: https://github.com/input-output-hk/iohk-monitoring-framework + commit: efa4b5ecd7f0a13124616b12679cd42517cd905a + subdirs: + - contra-tracer + - iohk-monitoring + - plugins/backend-aggregation + - plugins/backend-ekg + - plugins/backend-monitoring + - plugins/scribe-systemd + - tracer-transformers + - plugins/backend-trace-forwarder + +- git: https://github.com/input-output-hk/ouroboros-network + commit: ceafa31844e6e9883d5d5634544045eab9c5f2e9 + subdirs: + - io-sim + - io-sim-classes + - network-mux + - ntp-client + - Win32-network + - ouroboros-consensus + - ouroboros-consensus-byron + - ouroboros-consensus-byronspec + - ouroboros-consensus-cardano + - ouroboros-consensus-shelley + - ouroboros-consensus/ouroboros-consensus-mock + - ouroboros-consensus/ouroboros-consensus-test-infra + - ouroboros-network + - ouroboros-network-framework + - ouroboros-network-testing + - typed-protocols + - typed-protocols-examples + +- git: https://github.com/well-typed/cborg + commit: 42a83192749774268337258f4f94c97584b80ca6 + subdirs: + - cborg + +- git: https://github.com/snoyberg/http-client.git + commit: 1a75bdfca014723dd5d40760fad854b3f0f37156 + subdirs: + - http-client diff --git a/nix/.stack.nix/byron-spec-chain.nix b/nix/.stack.nix/byron-spec-chain.nix index 68c43920c8c..23324efd110 100644 --- a/nix/.stack.nix/byron-spec-chain.nix +++ b/nix/.stack.nix/byron-spec-chain.nix @@ -61,8 +61,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "ee92681752dc1a27ac77cb3466af8dca4ade997f"; - sha256 = "14k6dfq8ssc3c4shll813b8wfkf9vgsz2djvg2sll9pf2fz2g1vi"; + rev = "0294e7edd67a77c41dfdf4cd47af23dbefea0d9b"; + sha256 = "10am5zd9fls005qy86idkc8ip0g23pmlqdhzg3ljqisa5c17zcsb"; }); postUnpack = "sourceRoot+=/byron/chain/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/byron-spec-ledger.nix b/nix/.stack.nix/byron-spec-ledger.nix index 4fd78810e37..ab4e0c5221a 100644 --- a/nix/.stack.nix/byron-spec-ledger.nix +++ b/nix/.stack.nix/byron-spec-ledger.nix @@ -82,8 +82,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "ee92681752dc1a27ac77cb3466af8dca4ade997f"; - sha256 = "14k6dfq8ssc3c4shll813b8wfkf9vgsz2djvg2sll9pf2fz2g1vi"; + rev = "0294e7edd67a77c41dfdf4cd47af23dbefea0d9b"; + sha256 = "10am5zd9fls005qy86idkc8ip0g23pmlqdhzg3ljqisa5c17zcsb"; }); postUnpack = "sourceRoot+=/byron/ledger/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-api.nix b/nix/.stack.nix/cardano-api.nix index 6324c780f55..49bc656e336 100644 --- a/nix/.stack.nix/cardano-api.nix +++ b/nix/.stack.nix/cardano-api.nix @@ -107,8 +107,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "924a6f7d8c2bdb1bf525be8b0d5626e440697b01"; - sha256 = "0bi1vwmb1w6wc2szpr8v1nbsci9y36lnjr4v5pli1wvll1hhpw3c"; + rev = "a2161bac700fac55d2400b37f9935ed8ea527550"; + sha256 = "1yjfh82ikp9g5prxdcfgg0ni8lgy1k45p8hxk8dc736qgbc495pm"; }); postUnpack = "sourceRoot+=/cardano-api; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-cli.nix b/nix/.stack.nix/cardano-cli.nix index 83cc190fa65..062cb68c234 100644 --- a/nix/.stack.nix/cardano-cli.nix +++ b/nix/.stack.nix/cardano-cli.nix @@ -121,8 +121,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "924a6f7d8c2bdb1bf525be8b0d5626e440697b01"; - sha256 = "0bi1vwmb1w6wc2szpr8v1nbsci9y36lnjr4v5pli1wvll1hhpw3c"; + rev = "a2161bac700fac55d2400b37f9935ed8ea527550"; + sha256 = "1yjfh82ikp9g5prxdcfgg0ni8lgy1k45p8hxk8dc736qgbc495pm"; }); postUnpack = "sourceRoot+=/cardano-cli; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-config.nix b/nix/.stack.nix/cardano-config.nix index c25faa1e716..758b60e4e9e 100644 --- a/nix/.stack.nix/cardano-config.nix +++ b/nix/.stack.nix/cardano-config.nix @@ -113,8 +113,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "924a6f7d8c2bdb1bf525be8b0d5626e440697b01"; - sha256 = "0bi1vwmb1w6wc2szpr8v1nbsci9y36lnjr4v5pli1wvll1hhpw3c"; + rev = "a2161bac700fac55d2400b37f9935ed8ea527550"; + sha256 = "1yjfh82ikp9g5prxdcfgg0ni8lgy1k45p8hxk8dc736qgbc495pm"; }); postUnpack = "sourceRoot+=/cardano-config; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-crypto-test.nix b/nix/.stack.nix/cardano-crypto-test.nix index cc4f994675f..3290a6bb8f2 100644 --- a/nix/.stack.nix/cardano-crypto-test.nix +++ b/nix/.stack.nix/cardano-crypto-test.nix @@ -44,8 +44,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "ee92681752dc1a27ac77cb3466af8dca4ade997f"; - sha256 = "14k6dfq8ssc3c4shll813b8wfkf9vgsz2djvg2sll9pf2fz2g1vi"; + rev = "0294e7edd67a77c41dfdf4cd47af23dbefea0d9b"; + sha256 = "10am5zd9fls005qy86idkc8ip0g23pmlqdhzg3ljqisa5c17zcsb"; }); postUnpack = "sourceRoot+=/byron/crypto/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-crypto-wrapper.nix b/nix/.stack.nix/cardano-crypto-wrapper.nix index 8ac4dc24abc..7cff1531bc5 100644 --- a/nix/.stack.nix/cardano-crypto-wrapper.nix +++ b/nix/.stack.nix/cardano-crypto-wrapper.nix @@ -69,8 +69,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "ee92681752dc1a27ac77cb3466af8dca4ade997f"; - sha256 = "14k6dfq8ssc3c4shll813b8wfkf9vgsz2djvg2sll9pf2fz2g1vi"; + rev = "0294e7edd67a77c41dfdf4cd47af23dbefea0d9b"; + sha256 = "10am5zd9fls005qy86idkc8ip0g23pmlqdhzg3ljqisa5c17zcsb"; }); postUnpack = "sourceRoot+=/byron/crypto; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-ledger-test.nix b/nix/.stack.nix/cardano-ledger-test.nix index 56944077c7c..b04174f0d19 100644 --- a/nix/.stack.nix/cardano-ledger-test.nix +++ b/nix/.stack.nix/cardano-ledger-test.nix @@ -65,8 +65,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "ee92681752dc1a27ac77cb3466af8dca4ade997f"; - sha256 = "14k6dfq8ssc3c4shll813b8wfkf9vgsz2djvg2sll9pf2fz2g1vi"; + rev = "0294e7edd67a77c41dfdf4cd47af23dbefea0d9b"; + sha256 = "10am5zd9fls005qy86idkc8ip0g23pmlqdhzg3ljqisa5c17zcsb"; }); postUnpack = "sourceRoot+=/byron/ledger/impl/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-ledger.nix b/nix/.stack.nix/cardano-ledger.nix index a9ed3a421c2..c36cdc4812d 100644 --- a/nix/.stack.nix/cardano-ledger.nix +++ b/nix/.stack.nix/cardano-ledger.nix @@ -133,8 +133,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "ee92681752dc1a27ac77cb3466af8dca4ade997f"; - sha256 = "14k6dfq8ssc3c4shll813b8wfkf9vgsz2djvg2sll9pf2fz2g1vi"; + rev = "0294e7edd67a77c41dfdf4cd47af23dbefea0d9b"; + sha256 = "10am5zd9fls005qy86idkc8ip0g23pmlqdhzg3ljqisa5c17zcsb"; }); postUnpack = "sourceRoot+=/byron/ledger/impl; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-node.nix b/nix/.stack.nix/cardano-node.nix index 0c3848cac94..3fe581a8f46 100644 --- a/nix/.stack.nix/cardano-node.nix +++ b/nix/.stack.nix/cardano-node.nix @@ -114,8 +114,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "924a6f7d8c2bdb1bf525be8b0d5626e440697b01"; - sha256 = "0bi1vwmb1w6wc2szpr8v1nbsci9y36lnjr4v5pli1wvll1hhpw3c"; + rev = "a2161bac700fac55d2400b37f9935ed8ea527550"; + sha256 = "1yjfh82ikp9g5prxdcfgg0ni8lgy1k45p8hxk8dc736qgbc495pm"; }); postUnpack = "sourceRoot+=/cardano-node; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/default.nix b/nix/.stack.nix/default.nix index bfb8dcc7258..a19df503d1c 100644 --- a/nix/.stack.nix/default.nix +++ b/nix/.stack.nix/default.nix @@ -13,53 +13,6 @@ "servant-client" = (((hackage.servant-client)."0.17").revisions).default; "servant-swagger" = (((hackage.servant-swagger)."1.1.8").revisions).default; "zip" = (((hackage.zip)."1.3.0").revisions).default; - "base16" = (((hackage.base16)."0.1.2.1").revisions).default; - "base58-bytestring" = (((hackage.base58-bytestring)."0.1.0").revisions).default; - "base64" = (((hackage.base64)."0.4.1").revisions).default; - "bimap" = (((hackage.bimap)."0.4.0").revisions).default; - "binary" = (((hackage.binary)."0.8.7.0").revisions).default; - "brick" = (((hackage.brick)."0.47").revisions).default; - "canonical-json" = (((hackage.canonical-json)."0.6.0.0").revisions).default; - "clock" = (((hackage.clock)."0.8").revisions).default; - "config-ini" = (((hackage.config-ini)."0.2.4.0").revisions).default; - "connection" = (((hackage.connection)."0.3.1").revisions).default; - "containers" = (((hackage.containers)."0.5.11.0").revisions).default; - "data-clist" = (((hackage.data-clist)."0.1.2.2").revisions).default; - "dns" = (((hackage.dns)."3.0.4").revisions).default; - "generic-monoid" = (((hackage.generic-monoid)."0.1.0.0").revisions).default; - "generics-sop" = (((hackage.generics-sop)."0.5.1.0").revisions).default; - "gray-code" = (((hackage.gray-code)."0.3.1").revisions).default; - "hedgehog" = (((hackage.hedgehog)."1.0.2").revisions).default; - "hspec" = (((hackage.hspec)."2.7.0").revisions).default; - "hspec-core" = (((hackage.hspec-core)."2.7.0").revisions).default; - "hspec-discover" = (((hackage.hspec-discover)."2.7.0").revisions).default; - "io-streams" = (((hackage.io-streams)."1.5.1.0").revisions).default; - "io-streams-haproxy" = (((hackage.io-streams-haproxy)."1.0.1.0").revisions).default; - "katip" = (((hackage.katip)."0.8.4.0").revisions).default; - "libsystemd-journal" = (((hackage.libsystemd-journal)."1.4.4").revisions).default; - "micro-recursion-schemes" = (((hackage.micro-recursion-schemes)."5.0.2.2").revisions).default; - "moo" = (((hackage.moo)."1.2").revisions).default; - "network" = (((hackage.network)."3.1.1.1").revisions).default; - "prometheus" = (((hackage.prometheus)."2.1.2").revisions).default; - "quickcheck-instances" = (((hackage.quickcheck-instances)."0.3.19").revisions).default; - "QuickCheck" = (((hackage.QuickCheck)."2.12.6.1").revisions).default; - "quiet" = (((hackage.quiet)."0.2").revisions).default; - "snap-core" = (((hackage.snap-core)."1.0.4.1").revisions).default; - "snap-server" = (((hackage.snap-server)."1.1.1.1").revisions).default; - "sop-core" = (((hackage.sop-core)."0.5.0.1").revisions).default; - "statistics-linreg" = (((hackage.statistics-linreg)."0.3").revisions).default; - "streaming-binary" = (((hackage.streaming-binary)."0.3.0.1").revisions).default; - "systemd" = (((hackage.systemd)."2.3.0").revisions).default; - "tasty-hedgehog" = (((hackage.tasty-hedgehog)."1.0.0.2").revisions).default; - "text" = (((hackage.text)."1.2.4.0").revisions).default; - "text-zipper" = (((hackage.text-zipper)."0.10.1").revisions).default; - "th-lift-instances" = (((hackage.th-lift-instances)."0.1.14").revisions).default; - "time-units" = (((hackage.time-units)."1.0.0").revisions).default; - "transformers-except" = (((hackage.transformers-except)."0.1.1").revisions).default; - "Unique" = (((hackage.Unique)."0.4.7.6").revisions).default; - "websockets" = (((hackage.websockets)."0.12.6.1").revisions).default; - "Win32" = (((hackage.Win32)."2.6.2.0").revisions).default; - "word-wrap" = (((hackage.word-wrap)."0.4.1").revisions).default; cardano-wallet-core = ./cardano-wallet-core.nix; cardano-wallet-core-integration = ./cardano-wallet-core-integration.nix; cardano-wallet-cli = ./cardano-wallet-cli.nix; @@ -73,12 +26,10 @@ persistent-sqlite = ./persistent-sqlite.nix; persistent-template = ./persistent-template.nix; cardano-addresses = ./cardano-addresses.nix; - cardano-binary = ./cardano-binary.nix; - cardano-binary-test = ./cardano-binary-test.nix; - cardano-crypto-class = ./cardano-crypto-class.nix; - cardano-slotting = ./cardano-slotting.nix; - cardano-crypto-praos = ./cardano-crypto-praos.nix; - cardano-crypto = ./cardano-crypto.nix; + cardano-api = ./cardano-api.nix; + cardano-cli = ./cardano-cli.nix; + cardano-config = ./cardano-config.nix; + cardano-node = ./cardano-node.nix; cardano-ledger = ./cardano-ledger.nix; cardano-crypto-wrapper = ./cardano-crypto-wrapper.nix; cardano-ledger-test = ./cardano-ledger-test.nix; @@ -89,45 +40,9 @@ shelley-spec-non-integral = ./shelley-spec-non-integral.nix; shelley-spec-ledger = ./shelley-spec-ledger.nix; shelley-spec-ledger-test = ./shelley-spec-ledger-test.nix; - cardano-api = ./cardano-api.nix; - cardano-cli = ./cardano-cli.nix; - cardano-config = ./cardano-config.nix; - cardano-node = ./cardano-node.nix; - cardano-prelude = ./cardano-prelude.nix; - cardano-prelude-test = ./cardano-prelude-test.nix; - cardano-shell = ./cardano-shell.nix; - cardano-sl-x509 = ./cardano-sl-x509.nix; - goblins = ./goblins.nix; - contra-tracer = ./contra-tracer.nix; - iohk-monitoring = ./iohk-monitoring.nix; - lobemo-backend-aggregation = ./lobemo-backend-aggregation.nix; - lobemo-backend-ekg = ./lobemo-backend-ekg.nix; - lobemo-backend-monitoring = ./lobemo-backend-monitoring.nix; - lobemo-scribe-systemd = ./lobemo-scribe-systemd.nix; - tracer-transformers = ./tracer-transformers.nix; - lobemo-backend-trace-forwarder = ./lobemo-backend-trace-forwarder.nix; - io-sim = ./io-sim.nix; - io-sim-classes = ./io-sim-classes.nix; - network-mux = ./network-mux.nix; - ntp-client = ./ntp-client.nix; - Win32-network = ./Win32-network.nix; - ouroboros-consensus = ./ouroboros-consensus.nix; - ouroboros-consensus-byron = ./ouroboros-consensus-byron.nix; - ouroboros-consensus-byronspec = ./ouroboros-consensus-byronspec.nix; - ouroboros-consensus-cardano = ./ouroboros-consensus-cardano.nix; - ouroboros-consensus-shelley = ./ouroboros-consensus-shelley.nix; - ouroboros-consensus-mock = ./ouroboros-consensus-mock.nix; - ouroboros-consensus-test-infra = ./ouroboros-consensus-test-infra.nix; - ouroboros-network = ./ouroboros-network.nix; - ouroboros-network-framework = ./ouroboros-network-framework.nix; - ouroboros-network-testing = ./ouroboros-network-testing.nix; - typed-protocols = ./typed-protocols.nix; - typed-protocols-examples = ./typed-protocols-examples.nix; - cborg = ./cborg.nix; - http-client = ./http-client.nix; }; }; - resolver = "lts-14.25"; + resolver = "https://raw.githubusercontent.com/input-output-hk/cardano-haskell/633f6141c3e7211dbb0c6ae6ad50d4976313e190/snapshots/cardano-1.14.2.yaml"; modules = [ ({ lib, ... }: { diff --git a/nix/.stack.nix/shelley-spec-ledger-test.nix b/nix/.stack.nix/shelley-spec-ledger-test.nix index 5e9b76803f8..f07d043163f 100644 --- a/nix/.stack.nix/shelley-spec-ledger-test.nix +++ b/nix/.stack.nix/shelley-spec-ledger-test.nix @@ -69,8 +69,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "ee92681752dc1a27ac77cb3466af8dca4ade997f"; - sha256 = "14k6dfq8ssc3c4shll813b8wfkf9vgsz2djvg2sll9pf2fz2g1vi"; + rev = "0294e7edd67a77c41dfdf4cd47af23dbefea0d9b"; + sha256 = "10am5zd9fls005qy86idkc8ip0g23pmlqdhzg3ljqisa5c17zcsb"; }); postUnpack = "sourceRoot+=/shelley/chain-and-ledger/executable-spec/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/shelley-spec-ledger.nix b/nix/.stack.nix/shelley-spec-ledger.nix index 9129b640d92..acc1a757834 100644 --- a/nix/.stack.nix/shelley-spec-ledger.nix +++ b/nix/.stack.nix/shelley-spec-ledger.nix @@ -139,8 +139,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "ee92681752dc1a27ac77cb3466af8dca4ade997f"; - sha256 = "14k6dfq8ssc3c4shll813b8wfkf9vgsz2djvg2sll9pf2fz2g1vi"; + rev = "0294e7edd67a77c41dfdf4cd47af23dbefea0d9b"; + sha256 = "10am5zd9fls005qy86idkc8ip0g23pmlqdhzg3ljqisa5c17zcsb"; }); postUnpack = "sourceRoot+=/shelley/chain-and-ledger/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/shelley-spec-non-integral.nix b/nix/.stack.nix/shelley-spec-non-integral.nix index 2e5b05df492..1815aa0e0ad 100644 --- a/nix/.stack.nix/shelley-spec-non-integral.nix +++ b/nix/.stack.nix/shelley-spec-non-integral.nix @@ -42,8 +42,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "ee92681752dc1a27ac77cb3466af8dca4ade997f"; - sha256 = "14k6dfq8ssc3c4shll813b8wfkf9vgsz2djvg2sll9pf2fz2g1vi"; + rev = "0294e7edd67a77c41dfdf4cd47af23dbefea0d9b"; + sha256 = "10am5zd9fls005qy86idkc8ip0g23pmlqdhzg3ljqisa5c17zcsb"; }); postUnpack = "sourceRoot+=/shelley/chain-and-ledger/dependencies/non-integer; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/small-steps.nix b/nix/.stack.nix/small-steps.nix index 98141c9c42a..838c7514c24 100644 --- a/nix/.stack.nix/small-steps.nix +++ b/nix/.stack.nix/small-steps.nix @@ -88,8 +88,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "ee92681752dc1a27ac77cb3466af8dca4ade997f"; - sha256 = "14k6dfq8ssc3c4shll813b8wfkf9vgsz2djvg2sll9pf2fz2g1vi"; + rev = "0294e7edd67a77c41dfdf4cd47af23dbefea0d9b"; + sha256 = "10am5zd9fls005qy86idkc8ip0g23pmlqdhzg3ljqisa5c17zcsb"; }); postUnpack = "sourceRoot+=/semantics/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/snapshot.yaml b/snapshot.yaml deleted file mode 100644 index 5b88847e404..00000000000 --- a/snapshot.yaml +++ /dev/null @@ -1,23 +0,0 @@ -name: _ -resolver: https://raw.githubusercontent.com/input-output-hk/cardano-haskell/633f6141c3e7211dbb0c6ae6ad50d4976313e190/snapshots/cardano-1.14.2.yaml -packages: -- git: https://github.com/input-output-hk/cardano-node - commit: a2161bac700fac55d2400b37f9935ed8ea527550 - subdirs: - - cardano-api - - cardano-cli - - cardano-config - - cardano-node -- git: https://github.com/input-output-hk/cardano-ledger-specs - commit: 0294e7edd67a77c41dfdf4cd47af23dbefea0d9b - subdirs: - - byron/ledger/impl - - byron/crypto - - byron/ledger/impl/test - - byron/crypto/test - - byron/chain/executable-spec - - byron/ledger/executable-spec - - semantics/executable-spec - - shelley/chain-and-ledger/dependencies/non-integer - - shelley/chain-and-ledger/executable-spec - - shelley/chain-and-ledger/executable-spec/test diff --git a/stack.yaml b/stack.yaml index 0941ce89a60..34d0ad29a9d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,5 @@ -resolver: snapshot.yaml +resolver: cardano-1.14.x.yaml + packages: - lib/core - lib/core-integration From 02f61662ac90fd213a00adb68e529bc48bc8fdd4 Mon Sep 17 00:00:00 2001 From: IOHK Date: Fri, 3 Jul 2020 08:35:45 +0000 Subject: [PATCH 5/5] Regenerate nix --- nix/.stack.nix/default.nix | 95 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 5 deletions(-) diff --git a/nix/.stack.nix/default.nix b/nix/.stack.nix/default.nix index a19df503d1c..bfb8dcc7258 100644 --- a/nix/.stack.nix/default.nix +++ b/nix/.stack.nix/default.nix @@ -13,6 +13,53 @@ "servant-client" = (((hackage.servant-client)."0.17").revisions).default; "servant-swagger" = (((hackage.servant-swagger)."1.1.8").revisions).default; "zip" = (((hackage.zip)."1.3.0").revisions).default; + "base16" = (((hackage.base16)."0.1.2.1").revisions).default; + "base58-bytestring" = (((hackage.base58-bytestring)."0.1.0").revisions).default; + "base64" = (((hackage.base64)."0.4.1").revisions).default; + "bimap" = (((hackage.bimap)."0.4.0").revisions).default; + "binary" = (((hackage.binary)."0.8.7.0").revisions).default; + "brick" = (((hackage.brick)."0.47").revisions).default; + "canonical-json" = (((hackage.canonical-json)."0.6.0.0").revisions).default; + "clock" = (((hackage.clock)."0.8").revisions).default; + "config-ini" = (((hackage.config-ini)."0.2.4.0").revisions).default; + "connection" = (((hackage.connection)."0.3.1").revisions).default; + "containers" = (((hackage.containers)."0.5.11.0").revisions).default; + "data-clist" = (((hackage.data-clist)."0.1.2.2").revisions).default; + "dns" = (((hackage.dns)."3.0.4").revisions).default; + "generic-monoid" = (((hackage.generic-monoid)."0.1.0.0").revisions).default; + "generics-sop" = (((hackage.generics-sop)."0.5.1.0").revisions).default; + "gray-code" = (((hackage.gray-code)."0.3.1").revisions).default; + "hedgehog" = (((hackage.hedgehog)."1.0.2").revisions).default; + "hspec" = (((hackage.hspec)."2.7.0").revisions).default; + "hspec-core" = (((hackage.hspec-core)."2.7.0").revisions).default; + "hspec-discover" = (((hackage.hspec-discover)."2.7.0").revisions).default; + "io-streams" = (((hackage.io-streams)."1.5.1.0").revisions).default; + "io-streams-haproxy" = (((hackage.io-streams-haproxy)."1.0.1.0").revisions).default; + "katip" = (((hackage.katip)."0.8.4.0").revisions).default; + "libsystemd-journal" = (((hackage.libsystemd-journal)."1.4.4").revisions).default; + "micro-recursion-schemes" = (((hackage.micro-recursion-schemes)."5.0.2.2").revisions).default; + "moo" = (((hackage.moo)."1.2").revisions).default; + "network" = (((hackage.network)."3.1.1.1").revisions).default; + "prometheus" = (((hackage.prometheus)."2.1.2").revisions).default; + "quickcheck-instances" = (((hackage.quickcheck-instances)."0.3.19").revisions).default; + "QuickCheck" = (((hackage.QuickCheck)."2.12.6.1").revisions).default; + "quiet" = (((hackage.quiet)."0.2").revisions).default; + "snap-core" = (((hackage.snap-core)."1.0.4.1").revisions).default; + "snap-server" = (((hackage.snap-server)."1.1.1.1").revisions).default; + "sop-core" = (((hackage.sop-core)."0.5.0.1").revisions).default; + "statistics-linreg" = (((hackage.statistics-linreg)."0.3").revisions).default; + "streaming-binary" = (((hackage.streaming-binary)."0.3.0.1").revisions).default; + "systemd" = (((hackage.systemd)."2.3.0").revisions).default; + "tasty-hedgehog" = (((hackage.tasty-hedgehog)."1.0.0.2").revisions).default; + "text" = (((hackage.text)."1.2.4.0").revisions).default; + "text-zipper" = (((hackage.text-zipper)."0.10.1").revisions).default; + "th-lift-instances" = (((hackage.th-lift-instances)."0.1.14").revisions).default; + "time-units" = (((hackage.time-units)."1.0.0").revisions).default; + "transformers-except" = (((hackage.transformers-except)."0.1.1").revisions).default; + "Unique" = (((hackage.Unique)."0.4.7.6").revisions).default; + "websockets" = (((hackage.websockets)."0.12.6.1").revisions).default; + "Win32" = (((hackage.Win32)."2.6.2.0").revisions).default; + "word-wrap" = (((hackage.word-wrap)."0.4.1").revisions).default; cardano-wallet-core = ./cardano-wallet-core.nix; cardano-wallet-core-integration = ./cardano-wallet-core-integration.nix; cardano-wallet-cli = ./cardano-wallet-cli.nix; @@ -26,10 +73,12 @@ persistent-sqlite = ./persistent-sqlite.nix; persistent-template = ./persistent-template.nix; cardano-addresses = ./cardano-addresses.nix; - cardano-api = ./cardano-api.nix; - cardano-cli = ./cardano-cli.nix; - cardano-config = ./cardano-config.nix; - cardano-node = ./cardano-node.nix; + cardano-binary = ./cardano-binary.nix; + cardano-binary-test = ./cardano-binary-test.nix; + cardano-crypto-class = ./cardano-crypto-class.nix; + cardano-slotting = ./cardano-slotting.nix; + cardano-crypto-praos = ./cardano-crypto-praos.nix; + cardano-crypto = ./cardano-crypto.nix; cardano-ledger = ./cardano-ledger.nix; cardano-crypto-wrapper = ./cardano-crypto-wrapper.nix; cardano-ledger-test = ./cardano-ledger-test.nix; @@ -40,9 +89,45 @@ shelley-spec-non-integral = ./shelley-spec-non-integral.nix; shelley-spec-ledger = ./shelley-spec-ledger.nix; shelley-spec-ledger-test = ./shelley-spec-ledger-test.nix; + cardano-api = ./cardano-api.nix; + cardano-cli = ./cardano-cli.nix; + cardano-config = ./cardano-config.nix; + cardano-node = ./cardano-node.nix; + cardano-prelude = ./cardano-prelude.nix; + cardano-prelude-test = ./cardano-prelude-test.nix; + cardano-shell = ./cardano-shell.nix; + cardano-sl-x509 = ./cardano-sl-x509.nix; + goblins = ./goblins.nix; + contra-tracer = ./contra-tracer.nix; + iohk-monitoring = ./iohk-monitoring.nix; + lobemo-backend-aggregation = ./lobemo-backend-aggregation.nix; + lobemo-backend-ekg = ./lobemo-backend-ekg.nix; + lobemo-backend-monitoring = ./lobemo-backend-monitoring.nix; + lobemo-scribe-systemd = ./lobemo-scribe-systemd.nix; + tracer-transformers = ./tracer-transformers.nix; + lobemo-backend-trace-forwarder = ./lobemo-backend-trace-forwarder.nix; + io-sim = ./io-sim.nix; + io-sim-classes = ./io-sim-classes.nix; + network-mux = ./network-mux.nix; + ntp-client = ./ntp-client.nix; + Win32-network = ./Win32-network.nix; + ouroboros-consensus = ./ouroboros-consensus.nix; + ouroboros-consensus-byron = ./ouroboros-consensus-byron.nix; + ouroboros-consensus-byronspec = ./ouroboros-consensus-byronspec.nix; + ouroboros-consensus-cardano = ./ouroboros-consensus-cardano.nix; + ouroboros-consensus-shelley = ./ouroboros-consensus-shelley.nix; + ouroboros-consensus-mock = ./ouroboros-consensus-mock.nix; + ouroboros-consensus-test-infra = ./ouroboros-consensus-test-infra.nix; + ouroboros-network = ./ouroboros-network.nix; + ouroboros-network-framework = ./ouroboros-network-framework.nix; + ouroboros-network-testing = ./ouroboros-network-testing.nix; + typed-protocols = ./typed-protocols.nix; + typed-protocols-examples = ./typed-protocols-examples.nix; + cborg = ./cborg.nix; + http-client = ./http-client.nix; }; }; - resolver = "https://raw.githubusercontent.com/input-output-hk/cardano-haskell/633f6141c3e7211dbb0c6ae6ad50d4976313e190/snapshots/cardano-1.14.2.yaml"; + resolver = "lts-14.25"; modules = [ ({ lib, ... }: {