git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlPackages.js_of_ocaml: 3.5.2 → 3.6.0
commit5ac887002411b552330acb80eacd8f555e377d80 authorVincent Laporte <Vincent.Laporte@gmail.com> dateSun 21 Jun 2020, 07:37 (6 years ago) parentd34bde6
8 files changed+22−22
pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix+1 pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix+9−10 pkgs/development/tools/ocaml/js_of_ocaml/default.nix+2−2 pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix+2−2 pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix+2−2 pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix+2−2 pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix+2−2 pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix+2−2
pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix+1
@@ -3,6 +3,7 @@
33buildDunePackage {
44 pname = "ocplib-json-typed-browser";
55 inherit (ocplib-json-typed) version src;
6+ useDune2 = true;
67
78 propagatedBuildInputs = [ ocplib-json-typed js_of_ocaml ];
89
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix+9−10
@@ -1,19 +1,18 @@
1−{ lib, fetchFromGitHub, buildDunePackage
2−, ocaml, findlib, cmdliner, dune, cppo, yojson, ocaml-migrate-parsetree
1+{ lib, fetchurl, buildDunePackage
2+, ocaml, findlib, cmdliner, dune_2, cppo, yojson, ocaml-migrate-parsetree
33}:
44
55buildDunePackage rec {
66 pname = "js_of_ocaml-compiler";
7− version = "3.5.2";
7+ version = "3.6.0";
8+ useDune2 = true;
89
9− src = fetchFromGitHub {
10− owner = "ocsigen";
11− repo = "js_of_ocaml";
12− rev = version;
13− sha256 = "1fm855iavljx7rf9hii2qb7ky920zv082d9zlcl504by1bxp1yg8";
10+ src = fetchurl {
11+ url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
12+ sha256 = "51eaa89c83ef3168ef270bf7997cbc35a747936d3f51aa6fac58fb0323b4cbb0";
1413 };
1514
16− nativeBuildInputs = [ ocaml findlib dune cppo ];
15+ nativeBuildInputs = [ ocaml findlib dune_2 cppo ];
1716 buildInputs = [ cmdliner ];
1817
1918 configurePlatforms = [];
@@ -23,6 +22,6 @@ buildDunePackage rec {
2322 description = "Compiler from OCaml bytecode to Javascript";
2423 license = lib.licenses.gpl2;
2524 maintainers = [ lib.maintainers.vbgl ];
26− inherit (src.meta) homepage;
25+ homepage = "https://ocsigen.org/js_of_ocaml/";
2726 };
2827}
pkgs/development/tools/ocaml/js_of_ocaml/default.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
1+{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
22, ocaml-migrate-parsetree, ppx_tools_versioned, uchar
33}:
44
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88 inherit (js_of_ocaml-compiler) version src installPhase meta;
99
1010 buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ];
11− nativeBuildInputs = [ ocaml findlib dune ];
11+ nativeBuildInputs = [ ocaml findlib dune_2 ];
1212
1313 postPatch = "patchShebangs lib/generate_stubs.sh";
1414
pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler, js_of_ocaml-ppx
1+{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler, js_of_ocaml-ppx
22, ocaml-migrate-parsetree, ppx_tools_versioned
33, js_of_ocaml, ocaml_lwt, lwt_log
44}:
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88
99 inherit (js_of_ocaml-compiler) version src installPhase meta;
1010
11− buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
11+ buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
1212
1313 propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
1414
pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
1+{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
22, ocamlbuild
33}:
44
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
77
88 inherit (js_of_ocaml-compiler) version src installPhase meta;
99
10− buildInputs = [ ocaml findlib dune ];
10+ buildInputs = [ ocaml findlib dune_2 ];
1111
1212 propagatedBuildInputs = [ ocamlbuild ];
1313
pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
1+{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
22, ocaml-migrate-parsetree, ppx_tools_versioned
33, js_of_ocaml
44}:
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88
99 inherit (js_of_ocaml-compiler) version src installPhase meta;
1010
11− buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
11+ buildInputs = [ ocaml findlib dune_2 ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
1212
1313 buildPhase = "dune build -p js_of_ocaml-ppx";
1414}
pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
1+{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
22, js_of_ocaml, ppxlib
33}:
44
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
77
88 inherit (js_of_ocaml-compiler) version src installPhase meta;
99
10− buildInputs = [ ocaml findlib dune ];
10+ buildInputs = [ ocaml findlib dune_2 ];
1111
1212 propagatedBuildInputs = [ js_of_ocaml ppxlib ];
1313
pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix+2−2
@@ -1,4 +1,4 @@
1−{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
1+{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
22, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned
33, js_of_ocaml, reactivedata, tyxml
44}:
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
88
99 inherit (js_of_ocaml-compiler) version src installPhase meta;
1010
11− buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
11+ buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
1212
1313 propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
1414