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

jbuilder: 1.0.1 -> dune: 1.1.1

Browse Source
This commit is contained in:
Vincent Laporte
2018-09-15 19:32:32 +00:00
committed by Vincent Laporte
parent eb429c7c54
commit fc19401d67
69 changed files with 228 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
}:
@@ -7,11 +7,11 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned ];
buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned ];
postPatch = "patchShebangs lib/generate_stubs.sh";
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
buildPhase = "jbuilder build -p js_of_ocaml";
buildPhase = "dune build -p js_of_ocaml";
}
pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, camlp4, ocsigen_deriving
}:
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder camlp4 ocsigen_deriving ];
buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ];
buildPhase = "jbuilder build -p js_of_ocaml-camlp4";
buildPhase = "dune build -p js_of_ocaml-camlp4";
}
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, jbuilder
{ stdenv, fetchFromGitHub, ocaml, findlib, dune
, cmdliner, cppo, yojson
}:
@@ -17,13 +17,13 @@ stdenv.mkDerivation rec {
sha256 = "0dxxdxgrbg9xvvi3i627krnk6rb1ja0ypp2diwdkpnmy45wak9lv";
};
buildInputs = [ ocaml findlib jbuilder cmdliner cppo ];
buildInputs = [ ocaml findlib dune cmdliner cppo ];
propagatedBuildInputs = [ yojson ];
buildPhase = "jbuilder build -p js_of_ocaml-compiler";
buildPhase = "dune build -p js_of_ocaml-compiler";
inherit (jbuilder) installPhase;
inherit (dune) installPhase;
meta = {
description = "Compiler from OCaml bytecode to Javascript";
pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler, js_of_ocaml-ppx
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler, js_of_ocaml-ppx
, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml, ocaml_lwt, lwt_log
}:
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
buildPhase = "jbuilder build -p js_of_ocaml-lwt";
buildPhase = "dune build -p js_of_ocaml-lwt";
}
pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocamlbuild
}:
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ];
buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ ocamlbuild ];
buildPhase = "jbuilder build -p js_of_ocaml-ocamlbuild";
buildPhase = "dune build -p js_of_ocaml-ocamlbuild";
}
pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml
}:
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
buildPhase = "jbuilder build -p js_of_ocaml-ppx";
buildPhase = "dune build -p js_of_ocaml-ppx";
}
pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, js_of_ocaml, ppx_deriving
}:
@@ -7,9 +7,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder ];
buildInputs = [ ocaml findlib dune ];
propagatedBuildInputs = [ js_of_ocaml ppx_deriving ];
buildPhase = "jbuilder build -p js_of_ocaml-ppx_deriving_json";
buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json";
}
pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, jbuilder, js_of_ocaml-compiler
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml, reactivedata, tyxml
}:
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib jbuilder js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
buildPhase = "jbuilder build -p js_of_ocaml-tyxml";
buildPhase = "dune build -p js_of_ocaml-tyxml";
}