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

ocamlPackages.js_of_ocaml: 3.5.2 → 3.6.0

Browse Source
This commit is contained in:
Vincent Laporte 2020-06-21 07:37:56 +02:00 committed by Vincent Laporte
parent d34bde6ac7
commit 5ac8870024
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
View File

@ -3,6 +3,7 @@
buildDunePackage { buildDunePackage {
pname = "ocplib-json-typed-browser"; pname = "ocplib-json-typed-browser";
inherit (ocplib-json-typed) version src; inherit (ocplib-json-typed) version src;
useDune2 = true;
propagatedBuildInputs = [ ocplib-json-typed js_of_ocaml ]; propagatedBuildInputs = [ ocplib-json-typed js_of_ocaml ];

19
pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
View File

@ -1,19 +1,18 @@
{ lib, fetchFromGitHub, buildDunePackage { lib, fetchurl, buildDunePackage
, ocaml, findlib, cmdliner, dune, cppo, yojson, ocaml-migrate-parsetree , ocaml, findlib, cmdliner, dune_2, cppo, yojson, ocaml-migrate-parsetree
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "js_of_ocaml-compiler"; pname = "js_of_ocaml-compiler";
version = "3.5.2"; version = "3.6.0";
useDune2 = true;
src = fetchFromGitHub { src = fetchurl {
owner = "ocsigen"; url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
repo = "js_of_ocaml"; sha256 = "51eaa89c83ef3168ef270bf7997cbc35a747936d3f51aa6fac58fb0323b4cbb0";
rev = version;
sha256 = "1fm855iavljx7rf9hii2qb7ky920zv082d9zlcl504by1bxp1yg8";
}; };
nativeBuildInputs = [ ocaml findlib dune cppo ]; nativeBuildInputs = [ ocaml findlib dune_2 cppo ];
buildInputs = [ cmdliner ]; buildInputs = [ cmdliner ];
configurePlatforms = []; configurePlatforms = [];
@ -23,6 +22,6 @@ buildDunePackage rec {
description = "Compiler from OCaml bytecode to Javascript"; description = "Compiler from OCaml bytecode to Javascript";
license = lib.licenses.gpl2; license = lib.licenses.gpl2;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; homepage = "https://ocsigen.org/js_of_ocaml/";
}; };
} }

4
pkgs/development/tools/ocaml/js_of_ocaml/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler { stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar , ocaml-migrate-parsetree, ppx_tools_versioned, uchar
}: }:
@ -8,7 +8,7 @@ stdenv.mkDerivation {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ]; buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ];
nativeBuildInputs = [ ocaml findlib dune ]; nativeBuildInputs = [ ocaml findlib dune_2 ];
postPatch = "patchShebangs lib/generate_stubs.sh"; postPatch = "patchShebangs lib/generate_stubs.sh";

4
pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler, js_of_ocaml-ppx { stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler, js_of_ocaml-ppx
, ocaml-migrate-parsetree, ppx_tools_versioned , ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml, ocaml_lwt, lwt_log , js_of_ocaml, ocaml_lwt, lwt_log
}: }:
@ -8,7 +8,7 @@ stdenv.mkDerivation {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];

4
pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler { stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
, ocamlbuild , ocamlbuild
}: }:
@ -7,7 +7,7 @@ stdenv.mkDerivation {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib dune ]; buildInputs = [ ocaml findlib dune_2 ];
propagatedBuildInputs = [ ocamlbuild ]; propagatedBuildInputs = [ ocamlbuild ];

4
pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler { stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned , ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml , js_of_ocaml
}: }:
@ -8,7 +8,7 @@ stdenv.mkDerivation {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib dune ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ]; buildInputs = [ ocaml findlib dune_2 ocaml-migrate-parsetree ppx_tools_versioned js_of_ocaml ];
buildPhase = "dune build -p js_of_ocaml-ppx"; buildPhase = "dune build -p js_of_ocaml-ppx";
} }

4
pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler { stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
, js_of_ocaml, ppxlib , js_of_ocaml, ppxlib
}: }:
@ -7,7 +7,7 @@ stdenv.mkDerivation {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib dune ]; buildInputs = [ ocaml findlib dune_2 ];
propagatedBuildInputs = [ js_of_ocaml ppxlib ]; propagatedBuildInputs = [ js_of_ocaml ppxlib ];

4
pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler { stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler
, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned , js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml, reactivedata, tyxml , js_of_ocaml, reactivedata, tyxml
}: }:
@ -8,7 +8,7 @@ stdenv.mkDerivation {
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib dune js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ];
propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];