diff options
Diffstat (limited to 'pkgs/development/ocaml-modules/tezos')
29 files changed, 388 insertions, 93 deletions
diff --git a/pkgs/development/ocaml-modules/tezos/011-PtHangz2-test-helpers.nix b/pkgs/development/ocaml-modules/tezos/011-PtHangz2-test-helpers.nix new file mode 100644 index 0000000000000..589d6465b2066 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/011-PtHangz2-test-helpers.nix @@ -0,0 +1,35 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-base +, tezos-client-011-PtHangz2 +, tezos-protocol-011-PtHangz2 +, tezos-protocol-011-PtHangz2-parameters +, tezos-protocol-environment +, tezos-shell-services +, tezos-stdlib-unix +, tezos-test-helpers +}: + +buildDunePackage { + pname = "tezos-011-PtHangz2-test-helpers"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src"; + + propagatedBuildInputs = [ + tezos-base + tezos-client-011-PtHangz2 + tezos-protocol-011-PtHangz2 + tezos-protocol-011-PtHangz2-parameters + tezos-protocol-environment + tezos-shell-services + tezos-stdlib-unix + tezos-test-helpers + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: protocol testing framework"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/base-test-helpers.nix b/pkgs/development/ocaml-modules/tezos/base-test-helpers.nix new file mode 100644 index 0000000000000..d9a8307bd3058 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/base-test-helpers.nix @@ -0,0 +1,32 @@ +{ lib +, buildDunePackage +, alcotest +, alcotest-lwt +, tezos-base +, tezos-event-logging-test-helpers +, tezos-stdlib +, tezos-test-helpers +}: + +buildDunePackage { + pname = "tezos-base-test-helpers"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_base/test_helpers"; + + propagatedBuildInputs = [ + alcotest + alcotest-lwt + tezos-base + tezos-event-logging-test-helpers + ]; + + checkInputs = [ + tezos-test-helpers + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: base test helpers"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/client-011-PtHangz2.nix b/pkgs/development/ocaml-modules/tezos/client-011-PtHangz2.nix new file mode 100644 index 0000000000000..ec564f70f3bde --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/client-011-PtHangz2.nix @@ -0,0 +1,44 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-mockup-registration +, tezos-proxy +, tezos-signer-backends +, tezos-protocol-011-PtHangz2-parameters +, tezos-protocol-plugin-011-PtHangz2 +, alcotest-lwt +, cacert +, ppx_inline_test +, qcheck-alcotest +, tezos-base-test-helpers +, tezos-test-helpers +}: + +buildDunePackage { + pname = "tezos-client-011-PtHangz2"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src"; + + propagatedBuildInputs = [ + tezos-mockup-registration + tezos-proxy + tezos-signer-backends + tezos-protocol-011-PtHangz2-parameters + tezos-protocol-plugin-011-PtHangz2 + ppx_inline_test + ]; + + checkInputs = [ + alcotest-lwt + cacert + qcheck-alcotest + tezos-base-test-helpers + tezos-test-helpers + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: protocol specific library for `tezos-client`"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix b/pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix index f0f9c2be77068..e2b9a8e8d79bc 100644 --- a/pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix +++ b/pkgs/development/ocaml-modules/tezos/embedded-protocol-010-PtGRANAD.nix @@ -3,25 +3,18 @@ , tezos-stdlib , tezos-protocol-010-PtGRANAD , tezos-protocol-updater -, tezos-protocol-compiler }: buildDunePackage { pname = "tezos-embedded-protocol-010-PtGRANAD"; inherit (tezos-stdlib) version useDune2; - src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_protocol"; - - preBuild = tezos-protocol-010-PtGRANAD.preBuild; + src = "${tezos-stdlib.base_src}/src"; propagatedBuildInputs = [ tezos-protocol-010-PtGRANAD tezos-protocol-updater ]; - buildInputs = [ - tezos-protocol-compiler - ]; - doCheck = true; meta = tezos-stdlib.meta // { diff --git a/pkgs/development/ocaml-modules/tezos/embedded-protocol-demo-noops.nix b/pkgs/development/ocaml-modules/tezos/embedded-protocol-demo-noops.nix new file mode 100644 index 0000000000000..abe4aed67eb7a --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/embedded-protocol-demo-noops.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-demo-noops +, tezos-protocol-updater +}: + +buildDunePackage { + pname = "tezos-embedded-protocol-demo-noops"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src"; + + propagatedBuildInputs = [ + tezos-protocol-demo-noops + tezos-protocol-updater + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: demo_noops (economic-protocol definition, embedded in `tezos-node`)"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/event-logging-test-helpers.nix b/pkgs/development/ocaml-modules/tezos/event-logging-test-helpers.nix new file mode 100644 index 0000000000000..0407277bde997 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/event-logging-test-helpers.nix @@ -0,0 +1,25 @@ +{ lib +, buildDunePackage +, alcotest +, tezos-event-logging +, tezos-stdlib +, tezos-test-helpers +}: + +buildDunePackage { + pname = "tezos-event-logging-test-helpers"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_event_logging/test_helpers/"; + + propagatedBuildInputs = [ + alcotest + tezos-event-logging + tezos-test-helpers + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: test helpers for the event logging library"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix b/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix index 89c15b0f6345f..fd209741b3f6f 100644 --- a/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix +++ b/pkgs/development/ocaml-modules/tezos/lwt-result-stdlib.nix @@ -3,26 +3,22 @@ , ocaml , tezos-stdlib , lwt -, alcotest , alcotest-lwt , tezos-test-helpers }: -if lib.versionAtLeast ocaml.version "4.12" then - throw "tezos-lwt-result-stdlib-${tezos-stdlib.version} is not available for OCaml > 4.10" -else - buildDunePackage { pname = "tezos-lwt-result-stdlib"; inherit (tezos-stdlib) version useDune2; src = "${tezos-stdlib.base_src}/src/lib_lwt_result_stdlib"; + minimalOCamlVersion = "4.12"; + propagatedBuildInputs = [ lwt ]; checkInputs = [ - alcotest alcotest-lwt tezos-test-helpers ]; diff --git a/pkgs/development/ocaml-modules/tezos/p2p.nix b/pkgs/development/ocaml-modules/tezos/p2p.nix index cec1f1ef7b6e6..bdaabfda1b7d9 100644 --- a/pkgs/development/ocaml-modules/tezos/p2p.nix +++ b/pkgs/development/ocaml-modules/tezos/p2p.nix @@ -1,11 +1,14 @@ { lib , buildDunePackage -, tezos-stdlib -, tezos-p2p-services -, tezos-test-services , alcotest-lwt , astring +, lwt +, lwt-canceler , lwt-watcher +, ringo +, tezos-base-test-helpers +, tezos-p2p-services +, tezos-stdlib }: buildDunePackage { @@ -14,17 +17,20 @@ buildDunePackage { src = "${tezos-stdlib.base_src}/src/lib_p2p"; propagatedBuildInputs = [ - tezos-p2p-services + lwt + lwt-canceler lwt-watcher + ringo + tezos-p2p-services ]; checkInputs = [ - astring alcotest-lwt - tezos-test-services + astring + tezos-base-test-helpers ]; - doCheck = true; + doCheck = false; # some tests fail meta = tezos-stdlib.meta // { description = "Tezos: library for a pool of P2P connections"; diff --git a/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix b/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix index 80809cafbab22..2321245220f65 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-010-PtGRANAD.nix @@ -7,13 +7,7 @@ buildDunePackage { pname = "tezos-protocol-010-PtGRANAD"; inherit (tezos-stdlib) version useDune2; - src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_protocol"; - - preBuild = '' - rm dune - cp -f ${tezos-protocol-compiler.src}/dune_protocol dune - sed -i.back -e s/-nostdlib//g dune.inc - ''; + src = "${tezos-stdlib.base_src}/src"; buildInputs = [ tezos-protocol-compiler diff --git a/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2-parameters.nix b/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2-parameters.nix new file mode 100644 index 0000000000000..26b05e56f85c1 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2-parameters.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-011-PtHangz2 +, tezos-protocol-environment +}: + +buildDunePackage { + pname = "tezos-protocol-011-PtHangz2-parameters"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src"; + + propagatedBuildInputs = [ + tezos-protocol-011-PtHangz2 + tezos-protocol-environment + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: parameters"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix b/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix new file mode 100644 index 0000000000000..2dec60851770a --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-011-PtHangz2.nix @@ -0,0 +1,21 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-compiler +}: + +buildDunePackage { + pname = "tezos-protocol-011-PtHangz2"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src"; + + buildInputs = [ + tezos-protocol-compiler + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: economic-protocol definition"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-alpha.nix b/pkgs/development/ocaml-modules/tezos/protocol-alpha.nix new file mode 100644 index 0000000000000..df31eeeefb8e2 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-alpha.nix @@ -0,0 +1,21 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-compiler +}: + +buildDunePackage { + pname = "tezos-protocol-alpha"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src"; + + propagatedBuildInputs = [ + tezos-protocol-compiler + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: economic-protocol definition"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix b/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix index 6178fb6c0811f..ac72c518e8275 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-compiler.nix @@ -2,14 +2,14 @@ , buildDunePackage , ocaml , tezos-stdlib +, tezos-version , tezos-protocol-environment , ocp-ocamlres -, re , pprint }: -if lib.versionAtLeast ocaml.version "4.12" then - throw "tezos-protocol-compiler-${tezos-stdlib.version} is not available for OCaml > 4.10" +if lib.versionAtLeast ocaml.version "4.13" then + throw "tezos-protocol-compiler-${tezos-stdlib.version} is not available for OCaml > 4.12" else buildDunePackage { @@ -17,12 +17,12 @@ buildDunePackage { inherit (tezos-stdlib) version useDune2; src = "${tezos-stdlib.base_src}/src/lib_protocol_compiler"; - minimalOCamlVersion = "4.10"; + minimalOCamlVersion = "4.12"; propagatedBuildInputs = [ + tezos-version tezos-protocol-environment ocp-ocamlres - re pprint ]; diff --git a/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix b/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix new file mode 100644 index 0000000000000..02958401ff8f7 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-demo-noops.nix @@ -0,0 +1,21 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-compiler +}: + +buildDunePackage { + pname = "tezos-protocol-demo-noops"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/"; + + propagatedBuildInputs = [ + tezos-protocol-compiler + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: demo_noops economic-protocol definition"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix b/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix index 3008de6243198..dfd3fd14fe307 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-environment-sigs.nix @@ -11,6 +11,8 @@ buildDunePackage { inherit (tezos-stdlib) version useDune2; src = "${tezos-stdlib.base_src}/src/lib_protocol_environment"; + minimalOCamlVersion = "4.12"; + postPatch = '' ls ./sigs/v0 cp -f ${zarith}/lib/ocaml/${ocaml.version}/site-lib/zarith/z.mli ./sigs/v1/z.mli diff --git a/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix b/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix index f7b61b22b2353..c55578b5605ca 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-environment-structs.nix @@ -3,6 +3,7 @@ , tezos-stdlib , tezos-crypto , tezos-protocol-environment-packer +, bls12-381-legacy }: buildDunePackage { @@ -13,6 +14,7 @@ buildDunePackage { propagatedBuildInputs = [ tezos-crypto tezos-protocol-environment-packer + bls12-381-legacy ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/tezos/protocol-environment.nix b/pkgs/development/ocaml-modules/tezos/protocol-environment.nix index 292e4ce41ee6b..f3e8bc42c54c0 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-environment.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-environment.nix @@ -1,6 +1,8 @@ { lib , ocaml , buildDunePackage +, bls12-381 +, bls12-381-legacy , tezos-stdlib , tezos-base , tezos-sapling @@ -18,6 +20,8 @@ buildDunePackage { src = "${tezos-stdlib.base_src}/src/lib_protocol_environment"; propagatedBuildInputs = [ + bls12-381 + bls12-381-legacy tezos-sapling tezos-base tezos-context diff --git a/pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix b/pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix index 2ce2315774261..8e80b3c65d312 100644 --- a/pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix +++ b/pkgs/development/ocaml-modules/tezos/protocol-plugin-010-PtGRANAD.nix @@ -1,9 +1,8 @@ { lib , buildDunePackage , tezos-stdlib -, tezos-embedded-protocol-010-PtGRANAD , tezos-protocol-010-PtGRANAD -, tezos-shell +, tezos-protocol-environment }: buildDunePackage { @@ -12,9 +11,8 @@ buildDunePackage { src = "${tezos-stdlib.base_src}/src/proto_010_PtGRANAD/lib_plugin"; buildInputs = [ - tezos-embedded-protocol-010-PtGRANAD tezos-protocol-010-PtGRANAD - tezos-shell + tezos-protocol-environment ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/tezos/protocol-plugin-011-PtHangz2.nix b/pkgs/development/ocaml-modules/tezos/protocol-plugin-011-PtHangz2.nix new file mode 100644 index 0000000000000..79333e0461788 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-plugin-011-PtHangz2.nix @@ -0,0 +1,23 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-011-PtHangz2 +, tezos-protocol-environment +}: + +buildDunePackage { + pname = "tezos-protocol-plugin-011-PtHangz2"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src"; + + buildInputs = [ + tezos-protocol-011-PtHangz2 + tezos-protocol-environment + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: protocol plugin"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/protocol-plugin-alpha.nix b/pkgs/development/ocaml-modules/tezos/protocol-plugin-alpha.nix new file mode 100644 index 0000000000000..588a420a89015 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/protocol-plugin-alpha.nix @@ -0,0 +1,21 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-protocol-alpha +}: + +buildDunePackage { + pname = "tezos-protocol-plugin-alpha"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src"; + + propagatedBuildInputs = [ + tezos-protocol-alpha + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos/Protocol: protocol plugin"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/proxy.nix b/pkgs/development/ocaml-modules/tezos/proxy.nix index 4e46027de0dbe..91ed6ab2340db 100644 --- a/pkgs/development/ocaml-modules/tezos/proxy.nix +++ b/pkgs/development/ocaml-modules/tezos/proxy.nix @@ -5,9 +5,9 @@ , tezos-context , ringo-lwt , alcotest-lwt -, crowbar -, tezos-test-services -, tezos-test-helpers +, qcheck-alcotest +, tezos-base-test-helpers +, tezos-shell-services-test-helpers }: buildDunePackage { @@ -23,9 +23,9 @@ buildDunePackage { checkInputs = [ alcotest-lwt - crowbar - tezos-test-services - tezos-test-helpers + qcheck-alcotest + tezos-base-test-helpers + tezos-shell-services-test-helpers ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/tezos/requester.nix b/pkgs/development/ocaml-modules/tezos/requester.nix index 2326f8ec91d52..35e426feb292c 100644 --- a/pkgs/development/ocaml-modules/tezos/requester.nix +++ b/pkgs/development/ocaml-modules/tezos/requester.nix @@ -2,9 +2,11 @@ , buildDunePackage , tezos-stdlib , tezos-base -, tezos-test-services , lwt-watcher , alcotest-lwt +, qcheck-alcotest +, tezos-base-test-helpers +, tezos-test-helpers }: buildDunePackage { @@ -19,7 +21,9 @@ buildDunePackage { checkInputs = [ alcotest-lwt - tezos-test-services + qcheck-alcotest + tezos-base-test-helpers + tezos-test-helpers ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/tezos/sapling.nix b/pkgs/development/ocaml-modules/tezos/sapling.nix index a51973ed7241c..59e61d49af0cf 100644 --- a/pkgs/development/ocaml-modules/tezos/sapling.nix +++ b/pkgs/development/ocaml-modules/tezos/sapling.nix @@ -4,7 +4,7 @@ , tezos-stdlib , tezos-crypto , tezos-rust-libs -, tezos-test-services +, tezos-base-test-helpers , alcotest-lwt }: @@ -20,7 +20,7 @@ buildDunePackage { checkInputs = [ alcotest-lwt - tezos-test-services + tezos-base-test-helpers ]; # requires the "zcash-params" files diff --git a/pkgs/development/ocaml-modules/tezos/shell-services-test-helpers.nix b/pkgs/development/ocaml-modules/tezos/shell-services-test-helpers.nix new file mode 100644 index 0000000000000..077e44852edd2 --- /dev/null +++ b/pkgs/development/ocaml-modules/tezos/shell-services-test-helpers.nix @@ -0,0 +1,32 @@ +{ lib +, buildDunePackage +, tezos-stdlib +, tezos-test-helpers +, tezos-base +, tezos-shell-services +, qcheck-core +, qcheck-alcotest +}: + +buildDunePackage { + pname = "tezos-shell-services-test-helpers"; + inherit (tezos-stdlib) version useDune2; + src = "${tezos-stdlib.base_src}/src/lib_shell_services/test_helpers/"; + + propagatedBuildInputs = [ + tezos-base + tezos-shell-services + tezos-test-helpers + qcheck-core + ]; + + checkInputs = [ + qcheck-alcotest + ]; + + doCheck = true; + + meta = tezos-stdlib.meta // { + description = "Tezos: shell_services test helpers"; + }; +} diff --git a/pkgs/development/ocaml-modules/tezos/shell-services.nix b/pkgs/development/ocaml-modules/tezos/shell-services.nix index d15993e0a919e..34354b1821f8e 100644 --- a/pkgs/development/ocaml-modules/tezos/shell-services.nix +++ b/pkgs/development/ocaml-modules/tezos/shell-services.nix @@ -4,6 +4,7 @@ , tezos-workers , tezos-p2p-services , tezos-version +, alcotest-lwt }: buildDunePackage { @@ -19,6 +20,10 @@ buildDunePackage { doCheck = true; + checkInputs = [ + alcotest-lwt + ]; + meta = tezos-stdlib.meta // { description = "Tezos: descriptions of RPCs exported by `tezos-shell`"; }; diff --git a/pkgs/development/ocaml-modules/tezos/shell.nix b/pkgs/development/ocaml-modules/tezos/shell.nix index 268db42fcdb9f..cdf5ea6639557 100644 --- a/pkgs/development/ocaml-modules/tezos/shell.nix +++ b/pkgs/development/ocaml-modules/tezos/shell.nix @@ -5,13 +5,13 @@ , tezos-requester , tezos-validation , tezos-store -, tezos-workers -, tezos-test-services -# , tezos-embedded-protocol-demo-noops -, tezos-test-helpers -# , tezos-protocol-plugin-alpha +, lwt-canceler , alcotest-lwt -, crowbar +, qcheck-alcotest +, tezos-base-test-helpers +, tezos-embedded-protocol-demo-noops +, tezos-protocol-plugin-alpha +, tezos-test-helpers }: buildDunePackage { @@ -20,24 +20,23 @@ buildDunePackage { src = "${tezos-stdlib.base_src}/src/lib_shell"; propagatedBuildInputs = [ + lwt-canceler tezos-p2p tezos-requester - tezos-validation tezos-store - tezos-workers + tezos-validation ]; checkInputs = [ alcotest-lwt - crowbar + qcheck-alcotest + tezos-base-test-helpers + tezos-embedded-protocol-demo-noops + tezos-protocol-plugin-alpha tezos-test-helpers - tezos-test-services - # tezos-embedded-protocol-demo-noops - # tezos-protocol-plugin-alpha ]; - # A lot of extra deps with wide dependency cones needed - doCheck = false; + doCheck = true; meta = tezos-stdlib.meta // { description = "Tezos: descriptions of RPCs exported by `tezos-shell`"; diff --git a/pkgs/development/ocaml-modules/tezos/stdlib.nix b/pkgs/development/ocaml-modules/tezos/stdlib.nix index 07ec63785bea5..31dfd43b6153c 100644 --- a/pkgs/development/ocaml-modules/tezos/stdlib.nix +++ b/pkgs/development/ocaml-modules/tezos/stdlib.nix @@ -16,17 +16,17 @@ buildDunePackage rec { pname = "tezos-stdlib"; - version = "10.2"; + version = "11.0"; base_src = fetchFromGitLab { owner = "tezos"; repo = "tezos"; rev = "v${version}"; - sha256 = "1sqwbdclsvzz0781r0830ncy1j048h12jp3hsdy7hz4dpqp80jsq"; + sha256 = "uUYd1DxH2bdCQlevQt3oGxvg0ai5EiCD2mti5SiueU8="; }; src = "${base_src}/src/lib_stdlib"; - minimalOCamlVersion = "4.10.0"; + minimalOCamlVersion = "4.08"; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/tezos/test-helpers.nix b/pkgs/development/ocaml-modules/tezos/test-helpers.nix index 68a0d841ccf5d..6b3c42b85bac5 100644 --- a/pkgs/development/ocaml-modules/tezos/test-helpers.nix +++ b/pkgs/development/ocaml-modules/tezos/test-helpers.nix @@ -4,10 +4,7 @@ , qcheck-alcotest , alcotest , alcotest-lwt -, hashcons -, pyml , uri -, tezos-test-services , tezos-stdlib }: @@ -20,8 +17,6 @@ buildDunePackage rec { qcheck-alcotest alcotest alcotest-lwt - hashcons - pyml uri ]; diff --git a/pkgs/development/ocaml-modules/tezos/test-services.nix b/pkgs/development/ocaml-modules/tezos/test-services.nix deleted file mode 100644 index 0da38d896ead8..0000000000000 --- a/pkgs/development/ocaml-modules/tezos/test-services.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib -, fetchFromGitLab -, buildDunePackage -, tezos-stdlib -, tezos-base -, alcotest-lwt -}: - -buildDunePackage { - pname = "tezos-test-services"; - inherit (tezos-stdlib) version useDune2; - src = "${tezos-stdlib.base_src}/src/lib_test_services"; - - propagatedBuildInputs = [ - tezos-base - alcotest-lwt - ]; - - doCheck = true; - - meta = tezos-stdlib.meta // { - description = "Tezos: Alcotest-based test services"; - }; -} |