JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 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:44:39 +00:00
parent 4b1a1c1846
commit 935e991b72
7 changed files with 64 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/ocaml-modules/ojquery/default.nix
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;

5
pkgs/development/ocaml-modules/vg/default.nix
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;

4
pkgs/development/ocaml-modules/xtmpl/default.nix
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;

15
pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix Normal file
View File

@ -0,0 +1,15 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
}:
stdenv.mkDerivation rec {
name = "js_of_ocaml-${version}";
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
buildPhase = "jbuilder build -p js_of_ocaml";
}

13
pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix Normal file
View File

@ -0,0 +1,13 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
, camlp4
}:
stdenv.mkDerivation rec {
name = "js_of_ocaml-camlp4-${version}";
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder camlp4 ];
buildPhase = "jbuilder build -p js_of_ocaml-camlp4";
}

14
pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix Normal file
View File

@ -0,0 +1,14 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml
}:
stdenv.mkDerivation rec {
name = "js_of_ocaml-ppx-${version}";
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
buildPhase = "jbuilder build -p js_of_ocaml-ppx";
}

16
pkgs/top-level/ocaml-packages.nix
View File

@ -182,7 +182,10 @@ let
eff = callPackage ../development/interpreters/eff { };
eliom = callPackage ../development/ocaml-modules/eliom { lwt = lwt2; };
eliom = callPackage ../development/ocaml-modules/eliom {
lwt = lwt2;
js_of_ocaml = js_of_ocaml_2;
};
enumerate = callPackage ../development/ocaml-modules/enumerate { };
@ -270,12 +273,21 @@ let
pcre = ocaml_pcre;
};
js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; };
js_of_ocaml =
if lib.versionOlder "4.02" ocaml.version
then callPackage ../development/tools/ocaml/js_of_ocaml/3.0.nix { }
else js_of_ocaml_2;
js_of_ocaml_2 = callPackage ../development/tools/ocaml/js_of_ocaml { lwt = lwt2; };
js_of_ocaml-camlp4 = callPackage ../development/tools/ocaml/js_of_ocaml/camlp4.nix {};
js_of_ocaml-compiler = callPackage ../development/tools/ocaml/js_of_ocaml/compiler.nix {};
js_of_ocaml-ocamlbuild = callPackage ../development/tools/ocaml/js_of_ocaml/ocamlbuild.nix {};
js_of_ocaml-ppx = callPackage ../development/tools/ocaml/js_of_ocaml/ppx.nix {};
jsonm = callPackage ../development/ocaml-modules/jsonm { };
lablgl = callPackage ../development/ocaml-modules/lablgl { };