diff options
Diffstat (limited to 'pkgs/development/tools/ocaml/js_of_ocaml')
8 files changed, 25 insertions, 25 deletions
diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix index d8c289015b2..1307635abb9 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/3.0.nix @@ -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"; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix index 3caeabaae78..139ffef186b 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix @@ -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"; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix index 79801304595..cd242b5bd37 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix @@ -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"; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix index 5ec8cca344d..e7a31c1ce2e 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix @@ -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"; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix index 60ad695dc0b..bf33b4e59e5 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix @@ -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"; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix index 4f6b281c8b9..0649aee162a 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix @@ -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"; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix index 8f32887c5bf..ddea73b3c76 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix @@ -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"; } diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix index 041fd71f92f..1ba9ddd0ab7 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix @@ -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"; } |