kookie
/
nomicon
1
0
Fork 0
Code Issues Projects Releases 1 Activity

ocamlPackages.js_of_ocaml: 3.5.2 → 3.6.0

Browse Source
wip/yesman
Vincent Laporte 4 years ago committed by Vincent Laporte
parent d34bde6ac7
commit 5ac8870024
8 changed files with 22 additions and 22 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      pkgs/development/ocaml-modules/ocplib-json-typed/browser.nix
  2. 19
      pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
  3. 4
      pkgs/development/tools/ocaml/js_of_ocaml/default.nix
  4. 4
      pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
  5. 4
      pkgs/development/tools/ocaml/js_of_ocaml/ocamlbuild.nix
  6. 4
      pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
  7. 4
      pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
  8. 4
      pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix

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

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

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

@ -1,19 +1,18 @@
{ lib, fetchFromGitHub, buildDunePackage
, ocaml, findlib, cmdliner, dune, cppo, yojson, ocaml-migrate-parsetree
{ lib, fetchurl, buildDunePackage
, ocaml, findlib, cmdliner, dune_2, cppo, yojson, ocaml-migrate-parsetree
}:
buildDunePackage rec {
pname = "js_of_ocaml-compiler";
version = "3.5.2";
version = "3.6.0";
useDune2 = true;
src = fetchFromGitHub {
owner = "ocsigen";
repo = "js_of_ocaml";
rev = version;
sha256 = "1fm855iavljx7rf9hii2qb7ky920zv082d9zlcl504by1bxp1yg8";
src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
sha256 = "51eaa89c83ef3168ef270bf7997cbc35a747936d3f51aa6fac58fb0323b4cbb0";
};
nativeBuildInputs = [ ocaml findlib dune cppo ];
nativeBuildInputs = [ ocaml findlib dune_2 cppo ];
buildInputs = [ cmdliner ];
configurePlatforms = [];
@ -23,6 +22,6 @@ buildDunePackage rec {
description = "Compiler from OCaml bytecode to Javascript";
license = lib.licenses.gpl2;
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
Unescape 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
}:
@ -8,7 +8,7 @@ stdenv.mkDerivation {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ];
nativeBuildInputs = [ ocaml findlib dune ];
nativeBuildInputs = [ ocaml findlib dune_2 ];
postPatch = "patchShebangs lib/generate_stubs.sh";

4
pkgs/development/tools/ocaml/js_of_ocaml/lwt.nix
Unescape 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
, js_of_ocaml, ocaml_lwt, lwt_log
}:
@ -8,7 +8,7 @@ stdenv.mkDerivation {
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 ];

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

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

4
pkgs/development/tools/ocaml/js_of_ocaml/ppx.nix
Unescape 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
, js_of_ocaml
}:
@ -8,7 +8,7 @@ stdenv.mkDerivation {
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";
}

4
pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
Unescape 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
}:
@ -7,7 +7,7 @@ stdenv.mkDerivation {
inherit (js_of_ocaml-compiler) version src installPhase meta;
buildInputs = [ ocaml findlib dune ];
buildInputs = [ ocaml findlib dune_2 ];
propagatedBuildInputs = [ js_of_ocaml ppxlib ];

4
pkgs/development/tools/ocaml/js_of_ocaml/tyxml.nix
Unescape 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, reactivedata, tyxml
}:
@ -8,7 +8,7 @@ stdenv.mkDerivation {
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 ];

Write Preview
Loading…
Cancel
Save