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

ocamlPackages.js_of_ocaml*: 3.7.0 -> 3.8.0 

ocamlPackages.js_of_ocaml*: use buildDunePackage to fix installation
ocamlPackages.js_of_ocaml*: fix style for editorconfig

Closes #106343
This commit is contained in:
sternenseemann 2020-12-07 00:42:51 +01:00 committed by Vincent Laporte
parent 7c9ba95c3d
commit 2b0fc36c90
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
8 changed files with 64 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/tools/ocaml/js_of_ocaml/camlp4.nix
View File

@ -1,21 +1,19 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, dune, js_of_ocaml-compiler { buildDunePackage, fetchFromGitHub, js_of_ocaml-compiler
, camlp4, ocsigen_deriving , camlp4, ocsigen_deriving
}: }:
stdenv.mkDerivation rec { buildDunePackage rec {
version = "3.2.1"; version = "3.2.1";
pname = "js_of_ocaml-camlp4"; pname = "js_of_ocaml-camlp4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ocsigen"; owner = "ocsigen";
repo = "js_of_ocaml"; repo = "js_of_ocaml";
rev = version; rev = version;
sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik"; sha256 = "1v2hfq0ra9j07yz6pj6m03hrvgys4vmx0gclchv94yywpb2wc7ik";
}; };
inherit (js_of_ocaml-compiler) installPhase meta; inherit (js_of_ocaml-compiler) meta;
buildInputs = [ ocaml findlib dune camlp4 ocsigen_deriving ]; buildInputs = [ camlp4 ocsigen_deriving ];
buildPhase = "dune build -p js_of_ocaml-camlp4";
} }

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

@ -1,28 +1,28 @@
{ lib, fetchurl, buildDunePackage { lib, fetchurl, buildDunePackage
, ocaml, findlib, cmdliner, dune_2, cppo, yojson, ocaml-migrate-parsetree , cmdliner, cppo, yojson, ppxlib
, menhir , menhir
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "js_of_ocaml-compiler"; pname = "js_of_ocaml-compiler";
version = "3.7.1"; version = "3.8.0";
useDune2 = true; useDune2 = true;
src = fetchurl { src = fetchurl {
url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz"; url = "https://github.com/ocsigen/js_of_ocaml/releases/download/${version}/js_of_ocaml-${version}.tbz";
sha256 = "0i0smhvsfx2ydmbyg5ai5cgqsfnng8rkcvys4i3fa55cw24aknrn"; sha256 = "069jyiayxcgwnips3adxb3d53mzd4rrq2783b9fgmsiyzm545lcy";
}; };
nativeBuildInputs = [ ocaml findlib dune_2 cppo menhir ]; nativeBuildInputs = [ cppo menhir ];
buildInputs = [ cmdliner ]; buildInputs = [ cmdliner ];
configurePlatforms = []; configurePlatforms = [];
propagatedBuildInputs = [ yojson ocaml-migrate-parsetree ]; propagatedBuildInputs = [ yojson ppxlib ];
meta = { meta = {
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 ];
homepage = "https://ocsigen.org/js_of_ocaml/"; homepage = "https://ocsigen.org/js_of_ocaml/";
}; };
} }

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

@ -1,16 +1,13 @@
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler { buildDunePackage, js_of_ocaml-compiler
, ocaml-migrate-parsetree, ppx_tools_versioned, uchar , ppxlib, uchar
}: }:
stdenv.mkDerivation { buildDunePackage {
pname = "js_of_ocaml"; pname = "js_of_ocaml";
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src meta useDune2;
buildInputs = [ findlib ocaml-migrate-parsetree ppx_tools_versioned ]; buildInputs = [ ppxlib ];
nativeBuildInputs = [ ocaml findlib dune_2 ];
propagatedBuildInputs = [ js_of_ocaml-compiler uchar ]; propagatedBuildInputs = [ js_of_ocaml-compiler uchar ];
buildPhase = "dune build -p js_of_ocaml";
} }

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

@ -1,16 +1,13 @@
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler, js_of_ocaml-ppx { buildDunePackage, js_of_ocaml-compiler, js_of_ocaml-ppx
, ocaml-migrate-parsetree, ppx_tools_versioned
, js_of_ocaml, ocaml_lwt, lwt_log , js_of_ocaml, ocaml_lwt, lwt_log
}: }:
stdenv.mkDerivation { buildDunePackage {
pname = "js_of_ocaml-lwt"; pname = "js_of_ocaml-lwt";
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src meta useDune2;
buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; buildInputs = [ js_of_ocaml-ppx ];
propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ]; propagatedBuildInputs = [ js_of_ocaml ocaml_lwt lwt_log ];
buildPhase = "dune build -p js_of_ocaml-lwt";
} }

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

@ -1,15 +1,11 @@
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler { buildDunePackage, js_of_ocaml-compiler
, ocamlbuild , ocamlbuild
}: }:
stdenv.mkDerivation { buildDunePackage {
pname = "js_of_ocaml-ocamlbuild"; pname = "js_of_ocaml-ocamlbuild";
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src meta useDune2;
buildInputs = [ ocaml findlib dune_2 ]; propagatedBuildInputs = [ ocamlbuild ];
propagatedBuildInputs = [ ocamlbuild ];
buildPhase = "dune build -p js_of_ocaml-ocamlbuild";
} }

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

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

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

@ -1,19 +1,11 @@
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler { buildDunePackage, js_of_ocaml-compiler
, js_of_ocaml, ppxlib , js_of_ocaml, ppxlib
}: }:
if !stdenv.lib.versionAtLeast ppxlib.version "0.14" buildDunePackage {
then throw "js_of_ocaml-ppx_deriving_json is not compatible with ppxlib ${ppxlib.version}" pname = "js_of_ocaml-ppx_deriving_json";
else
stdenv.mkDerivation { inherit (js_of_ocaml-compiler) version src meta useDune2;
pname = "js_of_ocaml-ppx_deriving_json";
inherit (js_of_ocaml-compiler) version src installPhase meta; propagatedBuildInputs = [ js_of_ocaml ppxlib ];
buildInputs = [ ocaml findlib dune_2 ];
propagatedBuildInputs = [ js_of_ocaml ppxlib ];
buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json";
} }

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

@ -1,16 +1,14 @@
{ stdenv, ocaml, findlib, dune_2, js_of_ocaml-compiler { buildDunePackage, js_of_ocaml-compiler
, js_of_ocaml-ppx, ocaml-migrate-parsetree, ppx_tools_versioned , js_of_ocaml-ppx
, js_of_ocaml, reactivedata, tyxml , js_of_ocaml, reactivedata, tyxml
}: }:
stdenv.mkDerivation { buildDunePackage {
pname = "js_of_ocaml-tyxml"; pname = "js_of_ocaml-tyxml";
inherit (js_of_ocaml-compiler) version src installPhase meta; inherit (js_of_ocaml-compiler) version src meta useDune2;
buildInputs = [ ocaml findlib dune_2 js_of_ocaml-ppx ocaml-migrate-parsetree ppx_tools_versioned ]; buildInputs = [ js_of_ocaml-ppx ];
propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ]; propagatedBuildInputs = [ js_of_ocaml reactivedata tyxml ];
buildPhase = "dune build -p js_of_ocaml-tyxml";
} }