public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

js_of_ocaml: 2.8.4 -> 3.0.0

Browse Source 
js_of_ocaml-camlp4: init at 3.0.0

js_of_ocaml-ppx: init at 3.0.0
This commit is contained in:
Vincent Laporte
2017-08-27 14:55:12 +00:00
parent 4b1a1c1846
commit 935e991b72
7 changed files with 64 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/ocaml-modules/ojquery/default.nix
+3 -3
View File
@@ -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;
pkgs/development/ocaml-modules/vg/default.nix
+3 -2
View File
@@ -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;
pkgs/development/ocaml-modules/xtmpl/default.nix
+2 -2
View File
@@ -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;