diff options
-rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix | 12 | ||||
-rw-r--r-- | pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 4cdd0b8e3e2..82d84c819dd 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -1,23 +1,23 @@ { lib, fetchurl, buildDunePackage -, ocaml, cmdliner, cppo, yojson, ppxlib +, cmdliner, yojson, ppxlib , menhir, menhirLib }: buildDunePackage rec { pname = "js_of_ocaml-compiler"; - version = "3.10.0"; + version = "3.11.0"; useDune2 = true; src = fetchurl { url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; - sha256 = "09k19bygxl766dmshrp5df3i99jfm8bmamb4jggm62p3hg19bzkv"; + sha256 = "sha256:0flws9mw0yjfw4d8d3y3k408mivy2xgky70xk1br3iqs4zksz38m"; }; - nativeBuildInputs = [ cppo menhir ]; - buildInputs = [ cmdliner menhirLib ]; + nativeBuildInputs = [ menhir ]; + buildInputs = [ cmdliner ppxlib ]; configurePlatforms = []; - propagatedBuildInputs = [ yojson ppxlib ]; + propagatedBuildInputs = [ menhirLib yojson ]; meta = { description = "Compiler from OCaml bytecode to Javascript"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index b29ef435e46..3c0f8c76123 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -8,5 +8,6 @@ buildDunePackage { inherit (js_of_ocaml-compiler) version src meta useDune2; - buildInputs = [ ppxlib js_of_ocaml ]; + buildInputs = [ js_of_ocaml ]; + propagatedBuildInputs = [ ppxlib ]; } |