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

ocamlPackages.js_of_ocaml: 3.8.0 -> 3.9.1 

Apply patch from eliom's master to fix build with the new js_of_ocaml
version.
This commit is contained in:
sternenseemann 2021-03-24 16:09:42 +01:00 committed by Vincent Laporte
parent 6d7fcb093b
commit cf83099225
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/ocaml-modules/eliom/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml, { stdenv, lib, fetchzip, fetchpatch, which, ocsigen_server, ocaml,
lwt_react, lwt_react,
opaline, ppx_deriving, findlib opaline, ppx_deriving, findlib
, ocaml-migrate-parsetree , ocaml-migrate-parsetree
@ -23,6 +23,14 @@ stdenv.mkDerivation rec
sha256 = "00m6v2k4mg8705dy41934lznl6gj91i6dk7p1nkaccm51nna25kz"; sha256 = "00m6v2k4mg8705dy41934lznl6gj91i6dk7p1nkaccm51nna25kz";
}; };
patches = [
# Compatibility with js_of_ocaml >= 3.9.0, remove at next release
(fetchpatch {
url = "https://github.com/ocsigen/eliom/commit/4106a4217956f7b74a8ef3f73a1e1f55e02ade45.patch";
sha256 = "1cgbvpljn9x6zxirxf3rdjrsdwy319ykz3qq03c36cc40hy2w13p";
})
];
buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild
ocaml-migrate-parsetree ocaml-migrate-parsetree
js_of_ocaml-ppx_deriving_json opaline js_of_ocaml-ppx_deriving_json opaline

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

@ -1,16 +1,16 @@
{ lib, fetchurl, buildDunePackage { lib, fetchurl, buildDunePackage
, cmdliner, cppo, yojson, ppxlib , ocaml, cmdliner, cppo, yojson, ppxlib
, menhir , menhir
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "js_of_ocaml-compiler"; pname = "js_of_ocaml-compiler";
version = "3.8.0"; version = "3.9.1";
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 = "069jyiayxcgwnips3adxb3d53mzd4rrq2783b9fgmsiyzm545lcy"; sha256 = "0ib551kfsjlp9vr3fk36hrbq7xxyl8bj6vcn3ccr0s370bsmgpm6";
}; };
nativeBuildInputs = [ cppo menhir ]; nativeBuildInputs = [ cppo menhir ];