diff options
author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-08-27 14:44:39 +0000 |
---|---|---|
committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-08-27 14:55:12 +0000 |
commit | 935e991b724b096d78571c22d735dcbc8894515b (patch) | |
tree | 5a4f414cb93d52a596b45e99511dc385be24c19f /pkgs/development/ocaml-modules | |
parent | 4b1a1c1846b1b673f53728a02617a39ea6907006 (diff) |
js_of_ocaml: 2.8.4 -> 3.0.0
js_of_ocaml-camlp4: init at 3.0.0 js_of_ocaml-ppx: init at 3.0.0
Diffstat (limited to 'pkgs/development/ocaml-modules')
-rw-r--r-- | pkgs/development/ocaml-modules/ojquery/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/vg/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/ocaml-modules/xtmpl/default.nix | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/development/ocaml-modules/ojquery/default.nix b/pkgs/development/ocaml-modules/ojquery/default.nix index ec4a6114810b6..6e9ca15fb382e 100644 --- a/pkgs/development/ocaml-modules/ojquery/default.nix +++ b/pkgs/development/ocaml-modules/ojquery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, camlp4 }: +{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, js_of_ocaml, js_of_ocaml-camlp4, camlp4, lwt3, ocaml_react }: stdenv.mkDerivation rec { version = "0.1"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "1n01bsk4car40p94fk1ssvww0inqapwwhdylmrb7vv40drsdldp1"; }; - buildInputs = [ ocaml findlib ocamlbuild ]; - propagatedBuildInputs = [ js_of_ocaml camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild js_of_ocaml-camlp4 camlp4 ]; + propagatedBuildInputs = [ js_of_ocaml lwt3 ocaml_react ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix index ba33081486d75..0ef3ef4939b9c 100644 --- a/pkgs/development/ocaml-modules/vg/default.nix +++ b/pkgs/development/ocaml-modules/vg/default.nix @@ -1,5 +1,6 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, opam, topkg -, uchar, result, gg, uutf, otfm, js_of_ocaml, +, uchar, result, gg, uutf, otfm +, js_of_ocaml, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, pdfBackend ? true, # depends on uutf and otfm htmlcBackend ? true # depends on js_of_ocaml }: @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ uchar result gg ] ++ optionals pdfBackend [ uutf otfm ] - ++ optionals htmlcBackend [ js_of_ocaml ]; + ++ optionals htmlcBackend [ js_of_ocaml js_of_ocaml-ocamlbuild js_of_ocaml-ppx ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/xtmpl/default.nix b/pkgs/development/ocaml-modules/xtmpl/default.nix index 77569c44bec44..0d25b3785fc82 100644 --- a/pkgs/development/ocaml-modules/xtmpl/default.nix +++ b/pkgs/development/ocaml-modules/xtmpl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, ocaml, findlib, uutf, sedlex, ppx_tools, js_of_ocaml -, re }: +, js_of_ocaml-camlp4, camlp4, re }: if stdenv.lib.versionOlder ocaml.version "4.03" then throw "xtmpl not supported for ocaml ${ocaml.version}" @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1dj5b4b266y4d8q3v1g0xsivz4vkhj0gi0jis37w84xcnlgiik8k"; }; - buildInputs = [ ocaml findlib ppx_tools js_of_ocaml ]; + buildInputs = [ ocaml findlib ppx_tools js_of_ocaml js_of_ocaml-camlp4 camlp4 ]; propagatedBuildInputs = [ sedlex uutf re ]; createFindlibDestdir = true; |