Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

js_of_ocaml: 3.4.0 -> 3.5.2 #75766

Merged
merged 5 commits into from
Mar 6, 2020
Merged

js_of_ocaml: 3.4.0 -> 3.5.2 #75766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b1efdc1
js_of_ocaml: 3.4.0 -> 3.5.2
nomeata Dec 16, 2019
5b2bd85
Try to patch why3
nomeata Feb 12, 2020
7234749
ocamlPackages.js_of_ocaml-ppx_deriving_json: use ppxlib-0.12.0
vbgl Feb 14, 2020
29bd4c7
ocamlPackages.eliom: 6.8.0 → 6.10.1
vbgl Feb 25, 2020
4347de3
ocamlPackages.ocsigen-start: 2.7.0 → 2.16.1
vbgl Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkgs/applications/science/logic/why3/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ callPackage, fetchurl, stdenv
{ callPackage, fetchurl, fetchpatch, stdenv
, ocamlPackages, coqPackages, rubber, hevea, emacs }:

stdenv.mkDerivation {
Expand Down Expand Up @@ -30,7 +30,13 @@ stdenv.mkDerivation {
enableParallelBuilding = true;

# Remove unnecessary call to which
patches = [ ./configure.patch ];
patches = [ ./configure.patch
# Compatibility with js_of_ocaml 3.5
(fetchpatch {
url = "https://gitlab.inria.fr/why3/why3/commit/269ab313382fe3e64ef224813937314748bf7cf0.diff";
sha256 = "0i92wdnbh8pihvl93ac0ma1m5g95jgqqqj4kw6qqvbbjjqdgvzwa";
})
];

configureFlags = [ "--enable-verbose-make" ];

Expand Down
10 changes: 4 additions & 6 deletions pkgs/development/ocaml-modules/eliom/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ stdenv, fetchzip, which, ocsigen_server, ocaml,
lwt_react,
opaline, ppx_tools, ppx_deriving, findlib
, ppx_tools_versioned
opaline, ppx_deriving, findlib
, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json
, js_of_ocaml-lwt
, js_of_ocaml-tyxml
Expand All @@ -15,15 +14,14 @@ else
stdenv.mkDerivation rec
{
pname = "eliom";
version = "6.8.0";
version = "6.10.1";

src = fetchzip {
url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz";
sha256 = "0di4q0wzbnk9sxlaj97ivghzh8qvjb8n17h80y4nmqhys97pldif";
sha256 = "006722wcmhsfhyzv3qbgrrn53fbv9v4i31z52a0pznb6cll45nkm";
};

buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline ppx_tools
ppx_tools_versioned
buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline
];

propagatedBuildInputs = [
Expand Down
11 changes: 5 additions & 6 deletions pkgs/development/ocaml-modules/ocsigen-start/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{ stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocsigen-toolkit, pgocaml, macaque, safepass, yojson
, js_of_ocaml-camlp4, lwt_camlp4
{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, pgocaml_ppx, macaque, safepass, yojson
, cohttp-lwt-unix
, resource-pooling
}:

stdenv.mkDerivation rec {
name = "ocaml${ocaml.version}-ocsigen-start-${version}";
version = "2.7.0";
version = "2.16.1";

buildInputs = [ ocaml findlib js_of_ocaml-camlp4 lwt_camlp4 ];
propagatedBuildInputs = [ pgocaml macaque safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix camlp4 ];
buildInputs = [ ocaml findlib ];
propagatedBuildInputs = [ pgocaml_ppx safepass ocsigen-toolkit yojson resource-pooling cohttp-lwt-unix ];

patches = [ ./templates-dir.patch ];

Expand All @@ -23,7 +22,7 @@ stdenv.mkDerivation rec {
owner = "ocsigen";
repo = "ocsigen-start";
rev = version;
sha256 = "1kp9g679xnff2ybwsicnc9c203hi9ri1ijbpp6221b2sj6zxf2wc";
sha256 = "1pzpyrd3vbhc7zvzh6bv44793ikx5bglpd5p4wk5jj65v1w39jwd";
};

meta = {
Expand Down
6 changes: 3 additions & 3 deletions pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
stdenv.mkDerivation rec {
pname = "ocsigen-toolkit";
name = "ocaml${ocaml.version}-${pname}-${version}";
version = "2.2.0";
version = "2.5.0";

propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ];
propagatedBuildInputs = [ calendar js_of_ocaml-ppx_deriving_json eliom ];
buildInputs = [ ocaml findlib opaline ];

installPhase =
Expand All @@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
owner = "ocsigen";
repo = pname;
rev = version;
sha256 = "0qy6501jf81qcmkbicgrb1x4pxsjkhr40plwdn09w37d8vx9va3s";
sha256 = "0hll8qr363pbb65jnr2w36zcbplbwn08xb7826ayiwigakj783p9";
};

createFindlibDestdir = true;
Expand Down
11 changes: 9 additions & 2 deletions pkgs/development/ocaml-modules/ppxlib/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
{ stdenv, fetchFromGitHub, buildDunePackage
, version ? "0.8.1"
, ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio
}:

let sha256 =
{ "0.8.1" = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6";
"0.12.0" = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1";
}."${version}"
; in

buildDunePackage rec {
pname = "ppxlib";
version = "0.8.1";
inherit version;

src = fetchFromGitHub {
owner = "ocaml-ppx";
repo = pname;
rev = version;
sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6";
inherit sha256;
};

propagatedBuildInputs = [
Expand Down
8 changes: 4 additions & 4 deletions pkgs/development/tools/ocaml/js_of_ocaml/compiler.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{ lib, fetchFromGitHub, buildDunePackage
, ocaml, findlib, cmdliner, dune, cppo, yojson
, ocaml, findlib, cmdliner, dune, cppo, yojson, ocaml-migrate-parsetree
}:

buildDunePackage rec {
pname = "js_of_ocaml-compiler";
version = "3.4.0";
version = "3.5.2";

src = fetchFromGitHub {
owner = "ocsigen";
repo = "js_of_ocaml";
rev = version;
sha256 = "0c537say0f3197zn8d83nrihabrxyn28xc6d7c9c3l0vvrv6qvfj";
sha256 = "1fm855iavljx7rf9hii2qb7ky920zv082d9zlcl504by1bxp1yg8";
};

nativeBuildInputs = [ ocaml findlib dune cppo ];
buildInputs = [ cmdliner ];

configurePlatforms = [];
propagatedBuildInputs = [ yojson ];
propagatedBuildInputs = [ yojson ocaml-migrate-parsetree ];

meta = {
description = "Compiler from OCaml bytecode to Javascript";
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ stdenv, ocaml, findlib, dune, js_of_ocaml-compiler
, js_of_ocaml, ppx_deriving
, js_of_ocaml, ppxlib
}:

stdenv.mkDerivation {
Expand All @@ -9,7 +9,7 @@ stdenv.mkDerivation {

buildInputs = [ ocaml findlib dune ];

propagatedBuildInputs = [ js_of_ocaml ppx_deriving ];
propagatedBuildInputs = [ js_of_ocaml ppxlib ];

buildPhase = "dune build -p js_of_ocaml-ppx_deriving_json";
}
4 changes: 3 additions & 1 deletion pkgs/top-level/ocaml-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,9 @@ let

js_of_ocaml-ppx = callPackage ../development/tools/ocaml/js_of_ocaml/ppx.nix {};

js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix {};
js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix {
ppxlib = ppxlib.override { version = "0.12.0"; };
};

js_of_ocaml-tyxml = callPackage ../development/tools/ocaml/js_of_ocaml/tyxml.nix {};

Expand Down