From 93dbc8b14c06efb7a56d826d11c2bb865996aa0c Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Mon, 28 Feb 2022 15:29:36 +0100 Subject: [PATCH] ligo: 0.34.0 -> 0.36.0 Also changes to use the vendored tezos instead --- pkgs/development/compilers/ligo/default.nix | 57 ++++++++++++++++----- 1 file changed, 43 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 33a0ad49bd3d..36ec5bba2e20 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -1,17 +1,19 @@ { lib , fetchFromGitLab +, git , coq , cacert }: coq.ocamlPackages.buildDunePackage rec { pname = "ligo"; - version = "0.34.0"; + version = "0.36.0"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; rev = version; - sha256 = "sha256-MHkIr+XkW/zrRt+Cg48q4fOWTkNGH0hbf+oU7cAivNE="; + sha256 = "0zx8ai79ha3npm3aybzgisil27v9i052cqdllfri0fsc67dig78b"; + fetchSubmodules = true; }; # The build picks this up for ligo --version @@ -19,32 +21,59 @@ coq.ocamlPackages.buildDunePackage rec { useDune2 = true; + strictDeps = true; + + nativeBuildInputs = [ + git + coq + coq.ocamlPackages.menhir + coq.ocamlPackages.ocaml-recovery-parser + ]; + buildInputs = with coq.ocamlPackages; [ coq menhir menhirLib qcheck ocamlgraph + bisect_ppx ppx_deriving ppx_deriving_yojson ppx_expect - tezos-base - tezos-shell-services - tezos-010-PtGRANAD-test-helpers - tezos-011-PtHangz2-test-helpers - tezos-protocol-010-PtGRANAD-parameters - tezos-protocol-010-PtGRANAD - tezos-protocol-environment + ppx_import + terminal_size + ocaml-recovery-parser yojson getopt - terminal_size + core pprint linenoise + + # Test helpers deps + qcheck + qcheck-alcotest + alcotest-lwt + + # vendored tezos' deps + ctypes + hacl-star + hacl-star-raw + lwt-canceler + ipaddr + bls12-381-unix + bls12-381-legacy + ptime + mtime + lwt_log + ringo + ringo-lwt + secp256k1-internal + resto + resto-directory + resto-cohttp-self-serving-client + irmin-pack + ezjsonm data-encoding - bisect_ppx - cmdliner - core - ocaml-recovery-parser ]; checkInputs = [