From 55523e2b8a40d32d16debe1567037d2f0363b6a7 Mon Sep 17 00:00:00 2001 From: Johannes Lund Date: Sat, 13 Jun 2020 11:54:44 +0200 Subject: [PATCH] Bump cardano-node in nix --- nix/.stack.nix/Win32-network.nix | 4 +- nix/.stack.nix/byron-spec-chain.nix | 4 +- nix/.stack.nix/byron-spec-ledger.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/contra-tracer.nix | 4 +- nix/.stack.nix/io-sim-classes.nix | 4 +- nix/.stack.nix/io-sim.nix | 4 +- nix/.stack.nix/iohk-monitoring.nix | 4 +- nix/.stack.nix/lobemo-backend-aggregation.nix | 4 +- nix/.stack.nix/lobemo-backend-ekg.nix | 4 +- nix/.stack.nix/lobemo-backend-monitoring.nix | 4 +- .../lobemo-backend-trace-forwarder.nix | 4 +- nix/.stack.nix/lobemo-scribe-systemd.nix | 4 +- nix/.stack.nix/network-mux.nix | 4 +- nix/.stack.nix/ntp-client.nix | 4 +- nix/.stack.nix/ouroboros-consensus-byron.nix | 4 +- .../ouroboros-consensus-byronspec.nix | 4 +- .../ouroboros-consensus-cardano.nix | 23 ++++++- nix/.stack.nix/ouroboros-consensus-mock.nix | 4 +- .../ouroboros-consensus-shelley.nix | 4 +- .../ouroboros-consensus-test-infra.nix | 6 +- nix/.stack.nix/ouroboros-consensus.nix | 4 +- .../ouroboros-network-framework.nix | 4 +- nix/.stack.nix/ouroboros-network-testing.nix | 4 +- nix/.stack.nix/ouroboros-network.nix | 5 +- nix/.stack.nix/shelley-spec-ledger-test.nix | 9 ++- nix/.stack.nix/shelley-spec-ledger.nix | 64 +++++++++++++++---- nix/.stack.nix/shelley-spec-non-integral.nix | 4 +- nix/.stack.nix/small-steps.nix | 4 +- nix/.stack.nix/tracer-transformers.nix | 4 +- nix/.stack.nix/typed-protocols-examples.nix | 4 +- nix/.stack.nix/typed-protocols.nix | 4 +- nix/sources.json | 8 +-- 36 files changed, 151 insertions(+), 84 deletions(-) diff --git a/nix/.stack.nix/Win32-network.nix b/nix/.stack.nix/Win32-network.nix index 2e484a75c8f..6186830d89b 100644 --- a/nix/.stack.nix/Win32-network.nix +++ b/nix/.stack.nix/Win32-network.nix @@ -74,8 +74,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/Win32-network; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/byron-spec-chain.nix b/nix/.stack.nix/byron-spec-chain.nix index f97a170eab1..e429da4bb60 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 = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); 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 e21e13b2401..ceb621bffea 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 = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); 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-crypto-test.nix b/nix/.stack.nix/cardano-crypto-test.nix index d96c2d7a3a7..e1065a877a5 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 = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); 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 227b6b83ed0..270a58bdde2 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 = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); 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 ed3043ed7bd..be2d89e7b9c 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 = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); 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 a46c4f3d533..63ccffa23e1 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 = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); postUnpack = "sourceRoot+=/byron/ledger/impl; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/contra-tracer.nix b/nix/.stack.nix/contra-tracer.nix index bd700630474..147f34c7e38 100644 --- a/nix/.stack.nix/contra-tracer.nix +++ b/nix/.stack.nix/contra-tracer.nix @@ -34,8 +34,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/contra-tracer; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/io-sim-classes.nix b/nix/.stack.nix/io-sim-classes.nix index 23db9381b2c..61a01b130c4 100644 --- a/nix/.stack.nix/io-sim-classes.nix +++ b/nix/.stack.nix/io-sim-classes.nix @@ -51,8 +51,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/io-sim-classes; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/io-sim.nix b/nix/.stack.nix/io-sim.nix index 1fa6a87ed92..128c535dd5e 100644 --- a/nix/.stack.nix/io-sim.nix +++ b/nix/.stack.nix/io-sim.nix @@ -55,8 +55,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/io-sim; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/iohk-monitoring.nix b/nix/.stack.nix/iohk-monitoring.nix index 9b0f2cf3497..0b59cb0d18f 100644 --- a/nix/.stack.nix/iohk-monitoring.nix +++ b/nix/.stack.nix/iohk-monitoring.nix @@ -108,8 +108,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/iohk-monitoring; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-aggregation.nix b/nix/.stack.nix/lobemo-backend-aggregation.nix index f04f3cf5283..eaf3d154f81 100644 --- a/nix/.stack.nix/lobemo-backend-aggregation.nix +++ b/nix/.stack.nix/lobemo-backend-aggregation.nix @@ -47,8 +47,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/plugins/backend-aggregation; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-ekg.nix b/nix/.stack.nix/lobemo-backend-ekg.nix index 100128313b8..b8ad81f5daa 100644 --- a/nix/.stack.nix/lobemo-backend-ekg.nix +++ b/nix/.stack.nix/lobemo-backend-ekg.nix @@ -47,8 +47,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/plugins/backend-ekg; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-monitoring.nix b/nix/.stack.nix/lobemo-backend-monitoring.nix index 7a67bd564d9..152d0d9f49e 100644 --- a/nix/.stack.nix/lobemo-backend-monitoring.nix +++ b/nix/.stack.nix/lobemo-backend-monitoring.nix @@ -83,8 +83,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/plugins/backend-monitoring; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-backend-trace-forwarder.nix b/nix/.stack.nix/lobemo-backend-trace-forwarder.nix index 54c85e52f7a..4bc7d98ff41 100644 --- a/nix/.stack.nix/lobemo-backend-trace-forwarder.nix +++ b/nix/.stack.nix/lobemo-backend-trace-forwarder.nix @@ -47,8 +47,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/plugins/backend-trace-forwarder; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/lobemo-scribe-systemd.nix b/nix/.stack.nix/lobemo-scribe-systemd.nix index 0415cbc2375..35834c2dcb6 100644 --- a/nix/.stack.nix/lobemo-scribe-systemd.nix +++ b/nix/.stack.nix/lobemo-scribe-systemd.nix @@ -48,8 +48,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/plugins/scribe-systemd; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/network-mux.nix b/nix/.stack.nix/network-mux.nix index beadc81837b..c8b4a366a47 100644 --- a/nix/.stack.nix/network-mux.nix +++ b/nix/.stack.nix/network-mux.nix @@ -104,8 +104,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/network-mux; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ntp-client.nix b/nix/.stack.nix/ntp-client.nix index 85dd47a8d61..18bfd15cb90 100644 --- a/nix/.stack.nix/ntp-client.nix +++ b/nix/.stack.nix/ntp-client.nix @@ -67,8 +67,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ntp-client; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-byron.nix b/nix/.stack.nix/ouroboros-consensus-byron.nix index 938b6a7f3c0..ace2ca2123f 100644 --- a/nix/.stack.nix/ouroboros-consensus-byron.nix +++ b/nix/.stack.nix/ouroboros-consensus-byron.nix @@ -95,8 +95,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus-byron; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-byronspec.nix b/nix/.stack.nix/ouroboros-consensus-byronspec.nix index a76d39bc2e0..d6b4466ce88 100644 --- a/nix/.stack.nix/ouroboros-consensus-byronspec.nix +++ b/nix/.stack.nix/ouroboros-consensus-byronspec.nix @@ -52,8 +52,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus-byronspec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-cardano.nix b/nix/.stack.nix/ouroboros-consensus-cardano.nix index 3c63a1291b3..df1e5237562 100644 --- a/nix/.stack.nix/ouroboros-consensus-cardano.nix +++ b/nix/.stack.nix/ouroboros-consensus-cardano.nix @@ -30,10 +30,23 @@ "library" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."binary" or (errorHandler.buildDepError "binary")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) (hsPkgs."ouroboros-consensus-mock" or (errorHandler.buildDepError "ouroboros-consensus-mock")) @@ -45,11 +58,16 @@ "test" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."binary" or (errorHandler.buildDepError "binary")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) (hsPkgs."cardano-ledger-test" or (errorHandler.buildDepError "cardano-ledger-test")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) @@ -61,6 +79,7 @@ (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."ouroboros-consensus-test-infra" or (errorHandler.buildDepError "ouroboros-consensus-test-infra")) (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) + (hsPkgs."ouroboros-consensus-byron-test" or (errorHandler.buildDepError "ouroboros-consensus-byron-test")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) (hsPkgs."ouroboros-consensus-shelley-test" or (errorHandler.buildDepError "ouroboros-consensus-shelley-test")) (hsPkgs."ouroboros-consensus-cardano" or (errorHandler.buildDepError "ouroboros-consensus-cardano")) @@ -72,8 +91,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus-cardano; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-mock.nix b/nix/.stack.nix/ouroboros-consensus-mock.nix index 3162dd551e7..e6a315f16aa 100644 --- a/nix/.stack.nix/ouroboros-consensus-mock.nix +++ b/nix/.stack.nix/ouroboros-consensus-mock.nix @@ -75,8 +75,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus/ouroboros-consensus-mock; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-shelley.nix b/nix/.stack.nix/ouroboros-consensus-shelley.nix index 42450d727ab..5521ed5a51b 100644 --- a/nix/.stack.nix/ouroboros-consensus-shelley.nix +++ b/nix/.stack.nix/ouroboros-consensus-shelley.nix @@ -55,8 +55,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus-shelley; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus-test-infra.nix b/nix/.stack.nix/ouroboros-consensus-test-infra.nix index 2ac5ea05ff2..9640038fbdd 100644 --- a/nix/.stack.nix/ouroboros-consensus-test-infra.nix +++ b/nix/.stack.nix/ouroboros-consensus-test-infra.nix @@ -49,7 +49,9 @@ (hsPkgs."quickcheck-state-machine" or (errorHandler.buildDepError "quickcheck-state-machine")) (hsPkgs."random" or (errorHandler.buildDepError "random")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) @@ -80,8 +82,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus/ouroboros-consensus-test-infra; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-consensus.nix b/nix/.stack.nix/ouroboros-consensus.nix index 7fc81832887..2f29d422036 100644 --- a/nix/.stack.nix/ouroboros-consensus.nix +++ b/nix/.stack.nix/ouroboros-consensus.nix @@ -163,8 +163,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-consensus; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-network-framework.nix b/nix/.stack.nix/ouroboros-network-framework.nix index 812d4787077..fc0254d5455 100644 --- a/nix/.stack.nix/ouroboros-network-framework.nix +++ b/nix/.stack.nix/ouroboros-network-framework.nix @@ -116,8 +116,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-network-framework; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-network-testing.nix b/nix/.stack.nix/ouroboros-network-testing.nix index 820f153fc40..648bc75d32f 100644 --- a/nix/.stack.nix/ouroboros-network-testing.nix +++ b/nix/.stack.nix/ouroboros-network-testing.nix @@ -38,8 +38,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-network-testing; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/ouroboros-network.nix b/nix/.stack.nix/ouroboros-network.nix index 4b161ab493e..6fb97a3e5e0 100644 --- a/nix/.stack.nix/ouroboros-network.nix +++ b/nix/.stack.nix/ouroboros-network.nix @@ -33,6 +33,7 @@ (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."async" or (errorHandler.buildDepError "async")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) @@ -184,8 +185,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/ouroboros-network; 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 62ec7edd55b..5a21e8d54eb 100644 --- a/nix/.stack.nix/shelley-spec-ledger-test.nix +++ b/nix/.stack.nix/shelley-spec-ledger-test.nix @@ -26,13 +26,17 @@ components = { "library" = { depends = [ + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."bytestring-conversion" or (errorHandler.buildDepError "bytestring-conversion")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-crypto-test" or (errorHandler.buildDepError "cardano-crypto-test")) + (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-prelude-test" or (errorHandler.buildDepError "cardano-prelude-test")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) @@ -51,6 +55,7 @@ (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) ]; buildable = true; @@ -59,8 +64,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); 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 ef8cec28784..ec3cee9a5b3 100644 --- a/nix/.stack.nix/shelley-spec-ledger.nix +++ b/nix/.stack.nix/shelley-spec-ledger.nix @@ -28,29 +28,35 @@ depends = [ (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) + (hsPkgs."binary" or (errorHandler.buildDepError "binary")) + (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."cborg-json" or (errorHandler.buildDepError "cborg-json")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."shelley-spec-non-integral" or (errorHandler.buildDepError "shelley-spec-non-integral")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) - (hsPkgs."network" or (errorHandler.buildDepError "network")) - (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) - (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) - (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."bimap" or (errorHandler.buildDepError "bimap")) + (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) + (hsPkgs."goblins" or (errorHandler.buildDepError "goblins")) ]; buildable = true; }; @@ -58,6 +64,7 @@ "shelley-spec-ledger-test" = { depends = [ (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) @@ -65,8 +72,12 @@ (hsPkgs."bytestring-conversion" or (errorHandler.buildDepError "bytestring-conversion")) (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-crypto-test" or (errorHandler.buildDepError "cardano-crypto-test")) + (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) + (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) (hsPkgs."cardano-ledger-test" or (errorHandler.buildDepError "cardano-ledger-test")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-prelude-test" or (errorHandler.buildDepError "cardano-prelude-test")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) @@ -86,7 +97,36 @@ (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) + (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + ]; + buildable = true; + }; + }; + benchmarks = { + "mainbench" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-crypto" or (errorHandler.buildDepError "cardano-crypto")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."bytestring-conversion" or (errorHandler.buildDepError "bytestring-conversion")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."criterion" or (errorHandler.buildDepError "criterion")) + (hsPkgs."random" or (errorHandler.buildDepError "random")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."MonadRandom" or (errorHandler.buildDepError "MonadRandom")) ]; buildable = true; }; @@ -95,8 +135,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); 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 c0b8bd1b0e0..a0480451049 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 = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); 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 0772ca6a13b..9e788f47653 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 = "3671fe88f7d62769ed207cda0ee94a0effbb4c7f"; - sha256 = "00pf3hanch142b7if1kpwi9l5clbm2xays1cq2zka3p3a7xwzwp8"; + rev = "036ff8223310ecdaf7f0ed8c211c691cb0dcb8f3"; + sha256 = "1rwn92y530cfm5kqi2v4p0bi87lnjq2la8lwjpj7k3vmmnjzf7bv"; }); postUnpack = "sourceRoot+=/semantics/executable-spec; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/tracer-transformers.nix b/nix/.stack.nix/tracer-transformers.nix index 9307acfc2ef..ede79a31da5 100644 --- a/nix/.stack.nix/tracer-transformers.nix +++ b/nix/.stack.nix/tracer-transformers.nix @@ -57,8 +57,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/iohk-monitoring-framework"; - rev = "71df15f7b888d2671f619cc632080aaaaca48087"; - sha256 = "02shwi4qppf88biq2y9amfzkzif9j0fdj0d77zdjrfjacldvc6ci"; + rev = "2a1afe23d88b91027f972dd7c70cd4aadfb19768"; + sha256 = "0azd8m9qqvpmlqaddyi41iyksx08zn4ffyngmg83psp74l6dwzyf"; }); postUnpack = "sourceRoot+=/tracer-transformers; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/typed-protocols-examples.nix b/nix/.stack.nix/typed-protocols-examples.nix index 832a739d854..625044e0eaf 100644 --- a/nix/.stack.nix/typed-protocols-examples.nix +++ b/nix/.stack.nix/typed-protocols-examples.nix @@ -57,8 +57,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/typed-protocols-examples; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/typed-protocols.nix b/nix/.stack.nix/typed-protocols.nix index 7279406b7bf..2aa26b2708a 100644 --- a/nix/.stack.nix/typed-protocols.nix +++ b/nix/.stack.nix/typed-protocols.nix @@ -35,8 +35,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "16bca08140fb37746538edff9fe77220acf91d55"; - sha256 = "1m6z6qfy6y5rvlj0isrzf3wcm1vsmlzvhmn988dp14r6fycljvca"; + rev = "f9469fa3885aefdfa852216a66c4e319a0d19c11"; + sha256 = "1n0m03x5kri96lbslyc9vjvbn52b6639yhsdn2r43rhh5zmm86vq"; }); postUnpack = "sourceRoot+=/typed-protocols; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/sources.json b/nix/sources.json index 10dc5154974..22f2ab46ac5 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,14 @@ { "cardano-node": { - "branch": "1.13.0", + "branch": "master", "description": null, "homepage": null, "owner": "input-output-hk", "repo": "cardano-node", - "rev": "9925ef37dccbe7f423f3ceb81a5e1da3d924393b", - "sha256": "1yw5axs33g33znqxjkmjlrgks8ky79mc6lj2f28m2i2qfifyz12y", + "rev": "478230484677e1940291eff6004e93d71692a242", + "sha256": "0v9f2bn3zq181wdzlkf3klibbmf3jkq5q6sd2y564ramq9yh4k45", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-node/archive/9925ef37dccbe7f423f3ceb81a5e1da3d924393b.tar.gz", + "url": "https://github.com/input-output-hk/cardano-node/archive/478230484677e1940291eff6004e93d71692a242.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "haskell.nix": {