From 50a95e2e7741da877f3a35391fb70cf2e55828e4 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 15 Jul 2020 11:22:21 +1000 Subject: [PATCH] Bump cardano-node to latest master --- cardano-1.15.x.yaml => cardano-1.16.x.yaml | 14 +-- nix/.stack.nix/Win32-network.nix | 4 +- nix/.stack.nix/byron-spec-chain.nix | 6 +- nix/.stack.nix/byron-spec-ledger.nix | 7 +- nix/.stack.nix/cardano-api.nix | 7 +- nix/.stack.nix/cardano-binary-test.nix | 4 +- nix/.stack.nix/cardano-binary.nix | 4 +- nix/.stack.nix/cardano-cli.nix | 19 +++- nix/.stack.nix/cardano-config.nix | 5 +- nix/.stack.nix/cardano-crypto-class.nix | 4 +- nix/.stack.nix/cardano-crypto-praos.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 | 5 +- nix/.stack.nix/cardano-ledger.nix | 5 +- nix/.stack.nix/cardano-node.nix | 10 +- nix/.stack.nix/cardano-shell.nix | 82 ---------------- nix/.stack.nix/cardano-slotting.nix | 4 +- nix/.stack.nix/cardano-wallet-shelley.nix | 2 + nix/.stack.nix/default.nix | 2 +- nix/.stack.nix/io-sim-classes.nix | 4 +- nix/.stack.nix/io-sim.nix | 4 +- nix/.stack.nix/network-mux.nix | 4 +- nix/.stack.nix/ntp-client.nix | 4 +- nix/.stack.nix/ouroboros-consensus-byron.nix | 6 +- .../ouroboros-consensus-byronspec.nix | 4 +- .../ouroboros-consensus-cardano.nix | 30 +++++- nix/.stack.nix/ouroboros-consensus-mock.nix | 6 +- .../ouroboros-consensus-shelley.nix | 6 +- .../ouroboros-consensus-test-infra.nix | 11 ++- nix/.stack.nix/ouroboros-consensus.nix | 7 +- .../ouroboros-network-framework.nix | 53 +++++----- nix/.stack.nix/ouroboros-network-testing.nix | 4 +- nix/.stack.nix/ouroboros-network.nix | 80 +++++++-------- nix/.stack.nix/shelley-spec-ledger-test.nix | 5 +- nix/.stack.nix/shelley-spec-ledger.nix | 10 +- nix/.stack.nix/shelley-spec-non-integral.nix | 4 +- nix/.stack.nix/small-steps-test.nix | 98 +++++++++++++++++++ nix/.stack.nix/small-steps.nix | 35 ++----- nix/.stack.nix/typed-protocols-examples.nix | 4 +- nix/.stack.nix/typed-protocols.nix | 4 +- nix/sources.json | 8 +- stack.yaml | 2 +- 43 files changed, 312 insertions(+), 277 deletions(-) rename cardano-1.15.x.yaml => cardano-1.16.x.yaml (90%) delete mode 100644 nix/.stack.nix/cardano-shell.nix create mode 100644 nix/.stack.nix/small-steps-test.nix diff --git a/cardano-1.15.x.yaml b/cardano-1.16.x.yaml similarity index 90% rename from cardano-1.15.x.yaml rename to cardano-1.16.x.yaml index 2a976c38ac2..cf803d75b26 100644 --- a/cardano-1.15.x.yaml +++ b/cardano-1.16.x.yaml @@ -54,7 +54,7 @@ packages: - word-wrap-0.4.1 - git: https://github.com/input-output-hk/cardano-base - commit: 5e0b8bc8c7862be12da6989440f8644ba7c1e1cf + commit: 7d795c3040ea7785812efa1c97864bbb41b15d3e subdirs: - binary - binary/test @@ -66,7 +66,7 @@ packages: commit: 2547ad1e80aeabca2899951601079408becbc92c - git: https://github.com/input-output-hk/cardano-ledger-specs - commit: 12b13f390d64df6af6054b0d33bb3767756da041 + commit: 550a70b9ff83c9e9ddbcb7f7b49ee93161bb29ed subdirs: - byron/ledger/impl - byron/crypto @@ -75,12 +75,13 @@ packages: - byron/chain/executable-spec - byron/ledger/executable-spec - semantics/executable-spec + - semantics/small-steps-test - 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: 97b3e95c67940608f5acda929cf861e8ebfeddd1 + commit: e28c1d37832af9c4ec50bb5c64aa83c37dc4aa89 subdirs: - cardano-api - cardano-cli @@ -93,11 +94,6 @@ packages: - . - test -- git: https://github.com/input-output-hk/cardano-shell - commit: 5257fc818ef7df60986834310432e197aac90711 - subdirs: - - cardano-shell - - git: https://github.com/input-output-hk/cardano-sl-x509 commit: 43a036c5bbe68ca2e9cbe611eab7982e2348fe49 @@ -117,7 +113,7 @@ packages: - plugins/backend-trace-forwarder - git: https://github.com/input-output-hk/ouroboros-network - commit: 1361bb92814c65e5964732777fc7f8ec9ebdccfe + commit: 1c8924b856baf809f193798ff686cdb2c0ed25d2 subdirs: - io-sim - io-sim-classes diff --git a/nix/.stack.nix/Win32-network.nix b/nix/.stack.nix/Win32-network.nix index b1e03c24af8..79e4843085f 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 = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 a0aa7f8e49e..4b8a19b2faa 100644 --- a/nix/.stack.nix/byron-spec-chain.nix +++ b/nix/.stack.nix/byron-spec-chain.nix @@ -36,6 +36,7 @@ (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."lens" or (errorHandler.buildDepError "lens")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) ]; buildable = true; }; @@ -53,6 +54,7 @@ (hsPkgs."byron-spec-chain" or (errorHandler.buildDepError "byron-spec-chain")) (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) ]; buildable = true; }; @@ -61,8 +63,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "12b13f390d64df6af6054b0d33bb3767756da041"; - sha256 = "0v9zj73sz984xpg0azckfpibkllribbzksg18isx2m7w58bya77m"; + rev = "550a70b9ff83c9e9ddbcb7f7b49ee93161bb29ed"; + sha256 = "0qxlgknnys2iv8yxfyxbd32i6fbj3fp12a6smpypwqn662n5ybx5"; }); 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 5dd4ba18820..de98ef8a1e7 100644 --- a/nix/.stack.nix/byron-spec-ledger.nix +++ b/nix/.stack.nix/byron-spec-ledger.nix @@ -40,6 +40,7 @@ (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) ]; buildable = true; }; @@ -54,6 +55,7 @@ (hsPkgs."memory" or (errorHandler.buildDepError "memory")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) ]; build-tools = [ @@ -74,6 +76,7 @@ (hsPkgs."Unique" or (errorHandler.buildDepError "Unique")) (hsPkgs."byron-spec-ledger" or (errorHandler.buildDepError "byron-spec-ledger")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) ]; buildable = true; }; @@ -82,8 +85,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "12b13f390d64df6af6054b0d33bb3767756da041"; - sha256 = "0v9zj73sz984xpg0azckfpibkllribbzksg18isx2m7w58bya77m"; + rev = "550a70b9ff83c9e9ddbcb7f7b49ee93161bb29ed"; + sha256 = "0qxlgknnys2iv8yxfyxbd32i6fbj3fp12a6smpypwqn662n5ybx5"; }); 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 dd381725867..a51d9dff114 100644 --- a/nix/.stack.nix/cardano-api.nix +++ b/nix/.stack.nix/cardano-api.nix @@ -11,7 +11,7 @@ flags = {}; package = { specVersion = "1.10"; - identifier = { name = "cardano-api"; version = "1.15.0"; }; + identifier = { name = "cardano-api"; version = "1.16.0"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; @@ -42,7 +42,6 @@ (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-shell" or (errorHandler.buildDepError "cardano-shell")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) @@ -110,8 +109,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "97b3e95c67940608f5acda929cf861e8ebfeddd1"; - sha256 = "1b50lv1lmc3qb5i4x9jry1nq88hqwavk857c1wp7v9666pq4nb9a"; + rev = "e28c1d37832af9c4ec50bb5c64aa83c37dc4aa89"; + sha256 = "0pyfbc8iwyanj9s74b9iqh4h23if94akg4rx7g6ndzsq35jwk2n5"; }); postUnpack = "sourceRoot+=/cardano-api; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-binary-test.nix b/nix/.stack.nix/cardano-binary-test.nix index 91ca3d5912b..53de64e2b0d 100644 --- a/nix/.stack.nix/cardano-binary-test.nix +++ b/nix/.stack.nix/cardano-binary-test.nix @@ -48,8 +48,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "5e0b8bc8c7862be12da6989440f8644ba7c1e1cf"; - sha256 = "06i2wpla5hp4vz873zqy1f2p0pmbhnkmabw3ibhcf476qh3vfa3p"; + rev = "7d795c3040ea7785812efa1c97864bbb41b15d3e"; + sha256 = "130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz"; }); postUnpack = "sourceRoot+=/binary/test; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-binary.nix b/nix/.stack.nix/cardano-binary.nix index a3703d1d858..29bffc23530 100644 --- a/nix/.stack.nix/cardano-binary.nix +++ b/nix/.stack.nix/cardano-binary.nix @@ -71,8 +71,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "5e0b8bc8c7862be12da6989440f8644ba7c1e1cf"; - sha256 = "06i2wpla5hp4vz873zqy1f2p0pmbhnkmabw3ibhcf476qh3vfa3p"; + rev = "7d795c3040ea7785812efa1c97864bbb41b15d3e"; + sha256 = "130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz"; }); postUnpack = "sourceRoot+=/binary; 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 c74935f03ac..82c86619974 100644 --- a/nix/.stack.nix/cardano-cli.nix +++ b/nix/.stack.nix/cardano-cli.nix @@ -11,7 +11,7 @@ flags = { unexpected_thunks = false; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-cli"; version = "1.15.0"; }; + identifier = { name = "cardano-cli"; version = "1.16.0"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; @@ -52,8 +52,8 @@ (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) - (hsPkgs."lens" or (errorHandler.buildDepError "lens")) (hsPkgs."memory" or (errorHandler.buildDepError "memory")) + (hsPkgs."microlens" or (errorHandler.buildDepError "microlens")) (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."network-uri" or (errorHandler.buildDepError "network-uri")) @@ -65,6 +65,7 @@ (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) @@ -110,15 +111,25 @@ "cardano-cli-pioneers" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) (hsPkgs."bech32" or (errorHandler.buildDepError "bech32")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) (hsPkgs."cardano-api" or (errorHandler.buildDepError "cardano-api")) (hsPkgs."cardano-cli" or (errorHandler.buildDepError "cardano-cli")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."lifted-base" or (errorHandler.buildDepError "lifted-base")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) + (hsPkgs."process" or (errorHandler.buildDepError "process")) + (hsPkgs."temporary" or (errorHandler.buildDepError "temporary")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers-except" or (errorHandler.buildDepError "transformers-except")) + (hsPkgs."unordered-containers" or (errorHandler.buildDepError "unordered-containers")) ]; buildable = true; }; @@ -127,8 +138,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "97b3e95c67940608f5acda929cf861e8ebfeddd1"; - sha256 = "1b50lv1lmc3qb5i4x9jry1nq88hqwavk857c1wp7v9666pq4nb9a"; + rev = "e28c1d37832af9c4ec50bb5c64aa83c37dc4aa89"; + sha256 = "0pyfbc8iwyanj9s74b9iqh4h23if94akg4rx7g6ndzsq35jwk2n5"; }); 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 487627bd0a9..8b3415537a8 100644 --- a/nix/.stack.nix/cardano-config.nix +++ b/nix/.stack.nix/cardano-config.nix @@ -39,7 +39,6 @@ (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-shell" or (errorHandler.buildDepError "cardano-shell")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) @@ -82,8 +81,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "97b3e95c67940608f5acda929cf861e8ebfeddd1"; - sha256 = "1b50lv1lmc3qb5i4x9jry1nq88hqwavk857c1wp7v9666pq4nb9a"; + rev = "e28c1d37832af9c4ec50bb5c64aa83c37dc4aa89"; + sha256 = "0pyfbc8iwyanj9s74b9iqh4h23if94akg4rx7g6ndzsq35jwk2n5"; }); postUnpack = "sourceRoot+=/cardano-config; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-crypto-class.nix b/nix/.stack.nix/cardano-crypto-class.nix index bfa44fcf9ce..f03c9610b31 100644 --- a/nix/.stack.nix/cardano-crypto-class.nix +++ b/nix/.stack.nix/cardano-crypto-class.nix @@ -58,8 +58,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "5e0b8bc8c7862be12da6989440f8644ba7c1e1cf"; - sha256 = "06i2wpla5hp4vz873zqy1f2p0pmbhnkmabw3ibhcf476qh3vfa3p"; + rev = "7d795c3040ea7785812efa1c97864bbb41b15d3e"; + sha256 = "130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz"; }); postUnpack = "sourceRoot+=/cardano-crypto-class; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-crypto-praos.nix b/nix/.stack.nix/cardano-crypto-praos.nix index 83bc405a482..58f8935854d 100644 --- a/nix/.stack.nix/cardano-crypto-praos.nix +++ b/nix/.stack.nix/cardano-crypto-praos.nix @@ -47,8 +47,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "5e0b8bc8c7862be12da6989440f8644ba7c1e1cf"; - sha256 = "06i2wpla5hp4vz873zqy1f2p0pmbhnkmabw3ibhcf476qh3vfa3p"; + rev = "7d795c3040ea7785812efa1c97864bbb41b15d3e"; + sha256 = "130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz"; }); postUnpack = "sourceRoot+=/cardano-crypto-praos; 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 d7cf9662d23..6370539fdde 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 = "12b13f390d64df6af6054b0d33bb3767756da041"; - sha256 = "0v9zj73sz984xpg0azckfpibkllribbzksg18isx2m7w58bya77m"; + rev = "550a70b9ff83c9e9ddbcb7f7b49ee93161bb29ed"; + sha256 = "0qxlgknnys2iv8yxfyxbd32i6fbj3fp12a6smpypwqn662n5ybx5"; }); 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 f25cd6ba013..eaa1e8bf4e0 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 = "12b13f390d64df6af6054b0d33bb3767756da041"; - sha256 = "0v9zj73sz984xpg0azckfpibkllribbzksg18isx2m7w58bya77m"; + rev = "550a70b9ff83c9e9ddbcb7f7b49ee93161bb29ed"; + sha256 = "0qxlgknnys2iv8yxfyxbd32i6fbj3fp12a6smpypwqn662n5ybx5"; }); 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 e4c1086e538..82d48ffb5c2 100644 --- a/nix/.stack.nix/cardano-ledger-test.nix +++ b/nix/.stack.nix/cardano-ledger-test.nix @@ -52,6 +52,7 @@ (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) (hsPkgs."resourcet" or (errorHandler.buildDepError "resourcet")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) (hsPkgs."streaming" or (errorHandler.buildDepError "streaming")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hedgehog" or (errorHandler.buildDepError "tasty-hedgehog")) @@ -65,8 +66,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "12b13f390d64df6af6054b0d33bb3767756da041"; - sha256 = "0v9zj73sz984xpg0azckfpibkllribbzksg18isx2m7w58bya77m"; + rev = "550a70b9ff83c9e9ddbcb7f7b49ee93161bb29ed"; + sha256 = "0qxlgknnys2iv8yxfyxbd32i6fbj3fp12a6smpypwqn662n5ybx5"; }); 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 8d319bcaca3..30013feb007 100644 --- a/nix/.stack.nix/cardano-ledger.nix +++ b/nix/.stack.nix/cardano-ledger.nix @@ -94,6 +94,7 @@ (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) (hsPkgs."resourcet" or (errorHandler.buildDepError "resourcet")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) (hsPkgs."streaming" or (errorHandler.buildDepError "streaming")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hedgehog" or (errorHandler.buildDepError "tasty-hedgehog")) @@ -133,8 +134,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "12b13f390d64df6af6054b0d33bb3767756da041"; - sha256 = "0v9zj73sz984xpg0azckfpibkllribbzksg18isx2m7w58bya77m"; + rev = "550a70b9ff83c9e9ddbcb7f7b49ee93161bb29ed"; + sha256 = "0qxlgknnys2iv8yxfyxbd32i6fbj3fp12a6smpypwqn662n5ybx5"; }); 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 d82557ceb68..ce223c98c52 100644 --- a/nix/.stack.nix/cardano-node.nix +++ b/nix/.stack.nix/cardano-node.nix @@ -11,7 +11,7 @@ flags = { unexpected_thunks = false; systemd = true; }; package = { specVersion = "1.10"; - identifier = { name = "cardano-node"; version = "1.15.0"; }; + identifier = { name = "cardano-node"; version = "1.16.0"; }; license = "Apache-2.0"; copyright = ""; maintainer = "operations@iohk.io"; @@ -33,10 +33,10 @@ (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) (hsPkgs."cardano-api" or (errorHandler.buildDepError "cardano-api")) (hsPkgs."cardano-config" or (errorHandler.buildDepError "cardano-config")) + (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-shell" or (errorHandler.buildDepError "cardano-shell")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) @@ -112,7 +112,6 @@ (hsPkgs."cardano-config" or (errorHandler.buildDepError "cardano-config")) (hsPkgs."cardano-node" or (errorHandler.buildDepError "cardano-node")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."cardano-shell" or (errorHandler.buildDepError "cardano-shell")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) (hsPkgs."text" or (errorHandler.buildDepError "text")) ] ++ (if system.isWindows @@ -128,6 +127,7 @@ (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."cardano-api" or (errorHandler.buildDepError "cardano-api")) (hsPkgs."cardano-config" or (errorHandler.buildDepError "cardano-config")) + (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) @@ -181,8 +181,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-node"; - rev = "97b3e95c67940608f5acda929cf861e8ebfeddd1"; - sha256 = "1b50lv1lmc3qb5i4x9jry1nq88hqwavk857c1wp7v9666pq4nb9a"; + rev = "e28c1d37832af9c4ec50bb5c64aa83c37dc4aa89"; + sha256 = "0pyfbc8iwyanj9s74b9iqh4h23if94akg4rx7g6ndzsq35jwk2n5"; }); postUnpack = "sourceRoot+=/cardano-node; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-shell.nix b/nix/.stack.nix/cardano-shell.nix deleted file mode 100644 index b17ba9ded4a..00000000000 --- a/nix/.stack.nix/cardano-shell.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ system - , compiler - , flags - , pkgs - , hsPkgs - , pkgconfPkgs - , errorHandler - , config - , ... }: - { - flags = {}; - package = { - specVersion = "2.2"; - identifier = { name = "cardano-shell"; version = "0.1.0.0"; }; - license = "Apache-2.0"; - copyright = "2018 IOHK"; - maintainer = "operations@iohk.io"; - author = "IOHK"; - homepage = "https://github.com/input-output-hk/cardano-shell#readme"; - url = ""; - synopsis = ""; - description = "Please see the README on GitHub at "; - buildType = "Simple"; - isLocal = true; - }; - components = { - "library" = { - depends = [ - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."binary" or (errorHandler.buildDepError "binary")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."Cabal" or (errorHandler.buildDepError "Cabal")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."concurrency" or (errorHandler.buildDepError "concurrency")) - (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."formatting" or (errorHandler.buildDepError "formatting")) - (hsPkgs."process" or (errorHandler.buildDepError "process")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."safe-exceptions" or (errorHandler.buildDepError "safe-exceptions")) - (hsPkgs."async" or (errorHandler.buildDepError "async")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) - ] ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")); - buildable = true; - }; - exes = { - "node-ipc" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."cardano-shell" or (errorHandler.buildDepError "cardano-shell")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - ]; - buildable = true; - }; - }; - tests = { - "cardano-shell-test" = { - depends = [ - (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."cardano-shell" or (errorHandler.buildDepError "cardano-shell")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."quickcheck-state-machine" or (errorHandler.buildDepError "quickcheck-state-machine")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."tree-diff" or (errorHandler.buildDepError "tree-diff")) - (hsPkgs."hspec" or (errorHandler.buildDepError "hspec")) - ]; - buildable = true; - }; - }; - }; - } // { - src = (pkgs.lib).mkDefault (pkgs.fetchgit { - url = "https://github.com/input-output-hk/cardano-shell"; - rev = "5257fc818ef7df60986834310432e197aac90711"; - sha256 = "1si7jb084m2z9h773b1v4mgdkcjbbfpsyys3d6iz6gn0pzkijvc8"; - }); - postUnpack = "sourceRoot+=/cardano-shell; echo source root reset to \$sourceRoot"; - } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-slotting.nix b/nix/.stack.nix/cardano-slotting.nix index 294d9988c86..6864059971d 100644 --- a/nix/.stack.nix/cardano-slotting.nix +++ b/nix/.stack.nix/cardano-slotting.nix @@ -43,8 +43,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-base"; - rev = "5e0b8bc8c7862be12da6989440f8644ba7c1e1cf"; - sha256 = "06i2wpla5hp4vz873zqy1f2p0pmbhnkmabw3ibhcf476qh3vfa3p"; + rev = "7d795c3040ea7785812efa1c97864bbb41b15d3e"; + sha256 = "130i0yj4y9br1m2bhisi6wni3f40i31nfhg878hv0kwi17chl9sz"; }); postUnpack = "sourceRoot+=/slotting; echo source root reset to \$sourceRoot"; } \ No newline at end of file diff --git a/nix/.stack.nix/cardano-wallet-shelley.nix b/nix/.stack.nix/cardano-wallet-shelley.nix index 85b7f8231a3..64a2c89c17d 100644 --- a/nix/.stack.nix/cardano-wallet-shelley.nix +++ b/nix/.stack.nix/cardano-wallet-shelley.nix @@ -62,6 +62,8 @@ (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) + (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) + (hsPkgs."ouroboros-consensus-cardano" or (errorHandler.buildDepError "ouroboros-consensus-cardano")) (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) diff --git a/nix/.stack.nix/default.nix b/nix/.stack.nix/default.nix index 8f26b90d115..7b2da5fafd6 100644 --- a/nix/.stack.nix/default.nix +++ b/nix/.stack.nix/default.nix @@ -87,6 +87,7 @@ byron-spec-chain = ./byron-spec-chain.nix; byron-spec-ledger = ./byron-spec-ledger.nix; small-steps = ./small-steps.nix; + small-steps-test = ./small-steps-test.nix; 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; @@ -96,7 +97,6 @@ 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; diff --git a/nix/.stack.nix/io-sim-classes.nix b/nix/.stack.nix/io-sim-classes.nix index aa0fd533072..16ec9b27041 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 = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 394294f6db6..1842d273a3f 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 = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); postUnpack = "sourceRoot+=/io-sim; 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 9420d7f50ba..0d8e954614c 100644 --- a/nix/.stack.nix/network-mux.nix +++ b/nix/.stack.nix/network-mux.nix @@ -105,8 +105,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 590d47177c7..979b7383f6a 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 = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 d89b748b36a..f6e3c90c16e 100644 --- a/nix/.stack.nix/ouroboros-consensus-byron.nix +++ b/nix/.stack.nix/ouroboros-consensus-byron.nix @@ -58,7 +58,6 @@ (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) - (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) @@ -68,7 +67,6 @@ (hsPkgs."resourcet" or (errorHandler.buildDepError "resourcet")) (hsPkgs."streaming" or (errorHandler.buildDepError "streaming")) (hsPkgs."text" or (errorHandler.buildDepError "text")) - (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) ]; @@ -79,8 +77,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 ca6d5c5ec32..efdb95bfc38 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 = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 cce7730e25c..56603ad2e84 100644 --- a/nix/.stack.nix/ouroboros-consensus-cardano.nix +++ b/nix/.stack.nix/ouroboros-consensus-cardano.nix @@ -34,7 +34,6 @@ (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")) @@ -78,6 +77,30 @@ ]; buildable = true; }; + "db-validator" = { + depends = [ + (hsPkgs."aeson" or (errorHandler.buildDepError "aeson")) + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-crypto-wrapper" or (errorHandler.buildDepError "cardano-crypto-wrapper")) + (hsPkgs."cardano-ledger" or (errorHandler.buildDepError "cardano-ledger")) + (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) + (hsPkgs."directory" or (errorHandler.buildDepError "directory")) + (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."optparse-applicative" or (errorHandler.buildDepError "optparse-applicative")) + (hsPkgs."optparse-generic" or (errorHandler.buildDepError "optparse-generic")) + (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."time" or (errorHandler.buildDepError "time")) + (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) + (hsPkgs."ouroboros-consensus-byron" or (errorHandler.buildDepError "ouroboros-consensus-byron")) + (hsPkgs."ouroboros-consensus-cardano" or (errorHandler.buildDepError "ouroboros-consensus-cardano")) + (hsPkgs."ouroboros-consensus-shelley" or (errorHandler.buildDepError "ouroboros-consensus-shelley")) + ]; + buildable = true; + }; }; tests = { "test" = { @@ -96,6 +119,7 @@ (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."sop-core" or (errorHandler.buildDepError "sop-core")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) (hsPkgs."time" or (errorHandler.buildDepError "time")) @@ -116,8 +140,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 806af0c1353..0790a9b2037 100644 --- a/nix/.stack.nix/ouroboros-consensus-mock.nix +++ b/nix/.stack.nix/ouroboros-consensus-mock.nix @@ -37,7 +37,6 @@ (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) @@ -58,7 +57,6 @@ (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) @@ -75,8 +73,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 b86bc88f9c5..bc15b6cc7e8 100644 --- a/nix/.stack.nix/ouroboros-consensus-shelley.nix +++ b/nix/.stack.nix/ouroboros-consensus-shelley.nix @@ -40,9 +40,9 @@ (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (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."transformers" or (errorHandler.buildDepError "transformers")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."shelley-spec-non-integral" or (errorHandler.buildDepError "shelley-spec-non-integral")) @@ -56,8 +56,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 21d955a12ac..a921c2af48c 100644 --- a/nix/.stack.nix/ouroboros-consensus-test-infra.nix +++ b/nix/.stack.nix/ouroboros-consensus-test-infra.nix @@ -39,9 +39,11 @@ (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) - (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."fgl" or (errorHandler.buildDepError "fgl")) + (hsPkgs."file-embed" or (errorHandler.buildDepError "file-embed")) + (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."generics-sop" or (errorHandler.buildDepError "generics-sop")) (hsPkgs."graphviz" or (errorHandler.buildDepError "graphviz")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) @@ -51,12 +53,15 @@ (hsPkgs."random" or (errorHandler.buildDepError "random")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."tasty-golden" or (errorHandler.buildDepError "tasty-golden")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."template-haskell" or (errorHandler.buildDepError "template-haskell")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) (hsPkgs."tree-diff" or (errorHandler.buildDepError "tree-diff")) + (hsPkgs."utf8-string" or (errorHandler.buildDepError "utf8-string")) (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) @@ -83,8 +88,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 05b2c8ee2e9..1ee708156b1 100644 --- a/nix/.stack.nix/ouroboros-consensus.nix +++ b/nix/.stack.nix/ouroboros-consensus.nix @@ -39,7 +39,6 @@ (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) - (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) (hsPkgs."digest" or (errorHandler.buildDepError "digest")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) @@ -114,7 +113,6 @@ (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) (hsPkgs."random" or (errorHandler.buildDepError "random")) ]; @@ -158,7 +156,6 @@ (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) (hsPkgs."ouroboros-consensus" or (errorHandler.buildDepError "ouroboros-consensus")) (hsPkgs."base16-bytestring" or (errorHandler.buildDepError "base16-bytestring")) - (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) ]; buildable = true; @@ -168,8 +165,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 550b34299da..94cdafe50ca 100644 --- a/nix/.stack.nix/ouroboros-network-framework.nix +++ b/nix/.stack.nix/ouroboros-network-framework.nix @@ -32,27 +32,24 @@ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."dns" or (errorHandler.buildDepError "dns")) + (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) - (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) - (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) + (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")) - (hsPkgs."dns" or (errorHandler.buildDepError "dns")) - (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."typed-protocols-examples" or (errorHandler.buildDepError "typed-protocols-examples")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - ] ++ (pkgs.lib).optionals (system.isWindows) [ - (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")) - (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) - ]; + ] ++ (pkgs.lib).optional (system.isWindows) (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")); buildable = true; }; exes = { @@ -63,14 +60,14 @@ (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) - (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."network" or (errorHandler.buildDepError "network")) - (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) - (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) + (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) + (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) + (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."typed-protocols-examples" or (errorHandler.buildDepError "typed-protocols-examples")) ] ++ (pkgs.lib).optionals (system.isWindows) [ @@ -85,26 +82,26 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) + (hsPkgs."dns" or (errorHandler.buildDepError "dns")) + (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) + (hsPkgs."network" or (errorHandler.buildDepError "network")) + (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) - (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) + (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) - (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) - (hsPkgs."typed-protocols-examples" or (errorHandler.buildDepError "typed-protocols-examples")) - (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) - (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) - (hsPkgs."dns" or (errorHandler.buildDepError "dns")) - (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) - (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) - (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) + (hsPkgs."typed-protocols-examples" or (errorHandler.buildDepError "typed-protocols-examples")) ] ++ (pkgs.lib).optionals (system.isWindows) [ (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")) (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) @@ -116,8 +113,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 4d2173c2168..80591c0c8f9 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 = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 f4ddfbae0e1..ce35fff1407 100644 --- a/nix/.stack.nix/ouroboros-network.nix +++ b/nix/.stack.nix/ouroboros-network.nix @@ -27,30 +27,30 @@ "library" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) - (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) - (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) - (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")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."dns" or (errorHandler.buildDepError "dns")) - (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."network" or (errorHandler.buildDepError "network")) (hsPkgs."psqueues" or (errorHandler.buildDepError "psqueues")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) (hsPkgs."time" or (errorHandler.buildDepError "time")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) + (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) + (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) + (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) (hsPkgs."text" or (errorHandler.buildDepError "text")) ]; @@ -73,9 +73,9 @@ (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) - (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) - (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) + (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) ]; buildable = true; }; @@ -87,18 +87,18 @@ (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) - (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."network" or (errorHandler.buildDepError "network")) - (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) - (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."random" or (errorHandler.buildDepError "random")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."splitmix" or (errorHandler.buildDepError "splitmix")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) + (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) + (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) ]; buildable = true; }; @@ -107,43 +107,43 @@ "test-network" = { depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."array" or (errorHandler.buildDepError "array")) (hsPkgs."async" or (errorHandler.buildDepError "async")) (hsPkgs."binary" or (errorHandler.buildDepError "binary")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."dns" or (errorHandler.buildDepError "dns")) (hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) - (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."network" or (errorHandler.buildDepError "network")) - (hsPkgs."psqueues" or (errorHandler.buildDepError "psqueues")) - (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) (hsPkgs."pipes" or (errorHandler.buildDepError "pipes")) (hsPkgs."process" or (errorHandler.buildDepError "process")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."psqueues" or (errorHandler.buildDepError "psqueues")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) (hsPkgs."splitmix" or (errorHandler.buildDepError "splitmix")) (hsPkgs."stm" or (errorHandler.buildDepError "stm")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) - (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."text" or (errorHandler.buildDepError "text")) (hsPkgs."time" or (errorHandler.buildDepError "time")) - (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) - (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) + (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) + (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) + (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) + (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) + (hsPkgs."ouroboros-network-testing" or (errorHandler.buildDepError "ouroboros-network-testing")) (hsPkgs."ouroboros-protocol-tests" or (errorHandler.buildDepError "ouroboros-protocol-tests")) + (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) ] ++ (pkgs.lib).optionals (system.isWindows) [ (hsPkgs."Win32-network" or (errorHandler.buildDepError "Win32-network")) (hsPkgs."Win32" or (errorHandler.buildDepError "Win32")) @@ -154,26 +154,26 @@ depends = [ (hsPkgs."base" or (errorHandler.buildDepError "base")) (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) - (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) (hsPkgs."directory" or (errorHandler.buildDepError "directory")) (hsPkgs."filepath" or (errorHandler.buildDepError "filepath")) (hsPkgs."fingertree" or (errorHandler.buildDepError "fingertree")) (hsPkgs."hashable" or (errorHandler.buildDepError "hashable")) - (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) - (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) - (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."pipes" or (errorHandler.buildDepError "pipes")) (hsPkgs."process-extras" or (errorHandler.buildDepError "process-extras")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."serialise" or (errorHandler.buildDepError "serialise")) + (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) - (hsPkgs."text" or (errorHandler.buildDepError "text")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-slotting" or (errorHandler.buildDepError "cardano-slotting")) + (hsPkgs."contra-tracer" or (errorHandler.buildDepError "contra-tracer")) + (hsPkgs."io-sim" or (errorHandler.buildDepError "io-sim")) + (hsPkgs."io-sim-classes" or (errorHandler.buildDepError "io-sim-classes")) + (hsPkgs."network-mux" or (errorHandler.buildDepError "network-mux")) (hsPkgs."typed-protocols" or (errorHandler.buildDepError "typed-protocols")) (hsPkgs."ouroboros-network-framework" or (errorHandler.buildDepError "ouroboros-network-framework")) (hsPkgs."ouroboros-network" or (errorHandler.buildDepError "ouroboros-network")) @@ -186,8 +186,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/ouroboros-network"; - rev = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 0cc8c2a73a9..5a29d367796 100644 --- a/nix/.stack.nix/shelley-spec-ledger-test.nix +++ b/nix/.stack.nix/shelley-spec-ledger-test.nix @@ -56,6 +56,7 @@ (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."shelley-spec-ledger" or (errorHandler.buildDepError "shelley-spec-ledger")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hedgehog" or (errorHandler.buildDepError "tasty-hedgehog")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) @@ -70,8 +71,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "12b13f390d64df6af6054b0d33bb3767756da041"; - sha256 = "0v9zj73sz984xpg0azckfpibkllribbzksg18isx2m7w58bya77m"; + rev = "550a70b9ff83c9e9ddbcb7f7b49ee93161bb29ed"; + sha256 = "0qxlgknnys2iv8yxfyxbd32i6fbj3fp12a6smpypwqn662n5ybx5"; }); 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 925c8b4fb77..f0788c47fe7 100644 --- a/nix/.stack.nix/shelley-spec-ledger.nix +++ b/nix/.stack.nix/shelley-spec-ledger.nix @@ -46,6 +46,7 @@ (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."network" or (errorHandler.buildDepError "network")) + (hsPkgs."quiet" or (errorHandler.buildDepError "quiet")) (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."shelley-spec-non-integral" or (errorHandler.buildDepError "shelley-spec-non-integral")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) @@ -88,11 +89,13 @@ (hsPkgs."generic-random" or (errorHandler.buildDepError "generic-random")) (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) (hsPkgs."hedgehog-quickcheck" or (errorHandler.buildDepError "hedgehog-quickcheck")) + (hsPkgs."HUnit" or (errorHandler.buildDepError "HUnit")) (hsPkgs."iproute" or (errorHandler.buildDepError "iproute")) (hsPkgs."multiset" or (errorHandler.buildDepError "multiset")) (hsPkgs."process-extras" or (errorHandler.buildDepError "process-extras")) (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."tasty-hedgehog" or (errorHandler.buildDepError "tasty-hedgehog")) (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) @@ -125,12 +128,15 @@ (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) (hsPkgs."time" or (errorHandler.buildDepError "time")) + (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) (hsPkgs."criterion" or (errorHandler.buildDepError "criterion")) (hsPkgs."random" or (errorHandler.buildDepError "random")) (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."MonadRandom" or (errorHandler.buildDepError "MonadRandom")) (hsPkgs."deepseq" or (errorHandler.buildDepError "deepseq")) + (hsPkgs."scientific" or (errorHandler.buildDepError "scientific")) ]; buildable = true; }; @@ -139,8 +145,8 @@ } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "12b13f390d64df6af6054b0d33bb3767756da041"; - sha256 = "0v9zj73sz984xpg0azckfpibkllribbzksg18isx2m7w58bya77m"; + rev = "550a70b9ff83c9e9ddbcb7f7b49ee93161bb29ed"; + sha256 = "0qxlgknnys2iv8yxfyxbd32i6fbj3fp12a6smpypwqn662n5ybx5"; }); 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 757875008ff..313aa503184 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 = "12b13f390d64df6af6054b0d33bb3767756da041"; - sha256 = "0v9zj73sz984xpg0azckfpibkllribbzksg18isx2m7w58bya77m"; + rev = "550a70b9ff83c9e9ddbcb7f7b49ee93161bb29ed"; + sha256 = "0qxlgknnys2iv8yxfyxbd32i6fbj3fp12a6smpypwqn662n5ybx5"; }); 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-test.nix b/nix/.stack.nix/small-steps-test.nix new file mode 100644 index 00000000000..f7e77353c83 --- /dev/null +++ b/nix/.stack.nix/small-steps-test.nix @@ -0,0 +1,98 @@ +{ system + , compiler + , flags + , pkgs + , hsPkgs + , pkgconfPkgs + , errorHandler + , config + , ... }: + { + flags = { development = false; }; + package = { + specVersion = "1.10"; + identifier = { name = "small-steps-test"; version = "0.1.0.0"; }; + license = "LicenseRef-Apache"; + copyright = ""; + maintainer = "formal.methods@iohk.io"; + author = "IOHK Formal Methods Team"; + homepage = "https://github.com/input-output-hk/cardano-legder-specs"; + url = ""; + synopsis = "Small step semantics testing library"; + description = ""; + buildType = "Simple"; + isLocal = true; + }; + components = { + "library" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."bytestring" or (errorHandler.buildDepError "bytestring")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) + (hsPkgs."free" or (errorHandler.buildDepError "free")) + (hsPkgs."goblins" or (errorHandler.buildDepError "goblins")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) + (hsPkgs."lens" or (errorHandler.buildDepError "lens")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + ]; + buildable = true; + }; + tests = { + "doctests" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."data-default" or (errorHandler.buildDepError "data-default")) + (hsPkgs."free" or (errorHandler.buildDepError "free")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) + (hsPkgs."lens" or (errorHandler.buildDepError "lens")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."sequence" or (errorHandler.buildDepError "sequence")) + (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) + (hsPkgs."doctest" or (errorHandler.buildDepError "doctest")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) + ]; + build-tools = [ + (hsPkgs.buildPackages.doctest-discover or (pkgs.buildPackages.doctest-discover or (errorHandler.buildToolDepError "doctest-discover"))) + ]; + buildable = true; + }; + "examples" = { + depends = [ + (hsPkgs."base" or (errorHandler.buildDepError "base")) + (hsPkgs."containers" or (errorHandler.buildDepError "containers")) + (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) + (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) + (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) + (hsPkgs."tasty-hedgehog" or (errorHandler.buildDepError "tasty-hedgehog")) + (hsPkgs."tasty-expected-failure" or (errorHandler.buildDepError "tasty-expected-failure")) + (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) + (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) + (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) + (hsPkgs."Unique" or (errorHandler.buildDepError "Unique")) + (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) + (hsPkgs."small-steps-test" or (errorHandler.buildDepError "small-steps-test")) + ]; + buildable = true; + }; + }; + }; + } // { + src = (pkgs.lib).mkDefault (pkgs.fetchgit { + url = "https://github.com/input-output-hk/cardano-ledger-specs"; + rev = "550a70b9ff83c9e9ddbcb7f7b49ee93161bb29ed"; + sha256 = "0qxlgknnys2iv8yxfyxbd32i6fbj3fp12a6smpypwqn662n5ybx5"; + }); + postUnpack = "sourceRoot+=/semantics/small-steps-test; 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 6df6aedb5f8..cd5039fe16a 100644 --- a/nix/.stack.nix/small-steps.nix +++ b/nix/.stack.nix/small-steps.nix @@ -8,7 +8,7 @@ , config , ... }: { - flags = { development = false; }; + flags = { development = false; sts_assert = false; }; package = { specVersion = "1.10"; identifier = { name = "small-steps"; version = "0.1.0.0"; }; @@ -31,15 +31,13 @@ (hsPkgs."containers" or (errorHandler.buildDepError "containers")) (hsPkgs."cryptonite" or (errorHandler.buildDepError "cryptonite")) (hsPkgs."free" or (errorHandler.buildDepError "free")) - (hsPkgs."goblins" or (errorHandler.buildDepError "goblins")) - (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) - (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) - (hsPkgs."lens" or (errorHandler.buildDepError "lens")) (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) (hsPkgs."transformers" or (errorHandler.buildDepError "transformers")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."ansi-wl-pprint" or (errorHandler.buildDepError "ansi-wl-pprint")) (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) + (hsPkgs."cardano-prelude" or (errorHandler.buildDepError "cardano-prelude")) + (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) + (hsPkgs."cborg" or (errorHandler.buildDepError "cborg")) ]; buildable = true; }; @@ -64,32 +62,13 @@ ]; buildable = true; }; - "examples" = { - depends = [ - (hsPkgs."base" or (errorHandler.buildDepError "base")) - (hsPkgs."containers" or (errorHandler.buildDepError "containers")) - (hsPkgs."hedgehog" or (errorHandler.buildDepError "hedgehog")) - (hsPkgs."mtl" or (errorHandler.buildDepError "mtl")) - (hsPkgs."tasty" or (errorHandler.buildDepError "tasty")) - (hsPkgs."tasty-hedgehog" or (errorHandler.buildDepError "tasty-hedgehog")) - (hsPkgs."tasty-expected-failure" or (errorHandler.buildDepError "tasty-expected-failure")) - (hsPkgs."QuickCheck" or (errorHandler.buildDepError "QuickCheck")) - (hsPkgs."tasty-quickcheck" or (errorHandler.buildDepError "tasty-quickcheck")) - (hsPkgs."tasty-hunit" or (errorHandler.buildDepError "tasty-hunit")) - (hsPkgs."Unique" or (errorHandler.buildDepError "Unique")) - (hsPkgs."cardano-crypto-class" or (errorHandler.buildDepError "cardano-crypto-class")) - (hsPkgs."cardano-binary" or (errorHandler.buildDepError "cardano-binary")) - (hsPkgs."small-steps" or (errorHandler.buildDepError "small-steps")) - ]; - buildable = true; - }; }; }; } // { src = (pkgs.lib).mkDefault (pkgs.fetchgit { url = "https://github.com/input-output-hk/cardano-ledger-specs"; - rev = "12b13f390d64df6af6054b0d33bb3767756da041"; - sha256 = "0v9zj73sz984xpg0azckfpibkllribbzksg18isx2m7w58bya77m"; + rev = "550a70b9ff83c9e9ddbcb7f7b49ee93161bb29ed"; + sha256 = "0qxlgknnys2iv8yxfyxbd32i6fbj3fp12a6smpypwqn662n5ybx5"; }); postUnpack = "sourceRoot+=/semantics/executable-spec; 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 1f88b7d1388..a751af15ba2 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 = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 157a164deba..24ed39cf685 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 = "1361bb92814c65e5964732777fc7f8ec9ebdccfe"; - sha256 = "1znl9zzw5hswcd09zcvmgq50ppp46nbzjmw67wm4wpnw5lhnlwfy"; + rev = "1c8924b856baf809f193798ff686cdb2c0ed25d2"; + sha256 = "1ird981gi7wbj21g8d65jqv4q4iwch2akky4r8pf8r2w3b3767pv"; }); 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 c56a5f0473b..2b2e6db0197 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,14 @@ { "cardano-node": { - "branch": "1.15.1", + "branch": "1.16.0", "description": null, "homepage": null, "owner": "input-output-hk", "repo": "cardano-node", - "rev": "712a287602797e8fd889fbf73e56a08c3d8b004a", - "sha256": "1lg1g702x5q6m8n61bfyji7pmj2gsw44mm41nxhc5rv2wk4g996c", + "rev": "ab846e5e884ac1f3d044a0d15b9e69efc8256036", + "sha256": "1zm4ck89wqab9iw4kav9s0sjqr03xi0711asyzzysrszad24alpl", "type": "tarball", - "url": "https://github.com/input-output-hk/cardano-node/archive/712a287602797e8fd889fbf73e56a08c3d8b004a.tar.gz", + "url": "https://github.com/input-output-hk/cardano-node/archive/ab846e5e884ac1f3d044a0d15b9e69efc8256036.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "haskell.nix": { diff --git a/stack.yaml b/stack.yaml index e5bf4abe206..2cdac2800a8 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: cardano-1.15.x.yaml +resolver: cardano-1.16.x.yaml packages: - lib/core