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) 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/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/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": { diff --git a/stack.yaml b/stack.yaml index 152d56ead54..34d0ad29a9d 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,5 @@ -resolver: https://raw.githubusercontent.com/input-output-hk/cardano-haskell/633f6141c3e7211dbb0c6ae6ad50d4976313e190/snapshots/cardano-1.14.2.yaml +resolver: cardano-1.14.x.yaml + packages: - lib/core - lib/core-integration