diff options
| author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-03-24 16:09:42 +0100 |
|---|---|---|
| committer | Vincent Laporte <vbgl@users.noreply.github.com> | 2021-03-26 08:43:14 +0100 |
| commit | cf830992252ea9105a2e2911e7b82220cf53be65 (patch) | |
| tree | ebff906aa245124e2fa8a327ade32c58aa59d344 /pkgs/development/ocaml-modules/eliom | |
| parent | 6d7fcb093b8a0ea004b9e7ded429ab31ac5be7c5 (diff) | |
| download | nixpkgs-cf830992252ea9105a2e2911e7b82220cf53be65.tar nixpkgs-cf830992252ea9105a2e2911e7b82220cf53be65.tar.gz nixpkgs-cf830992252ea9105a2e2911e7b82220cf53be65.tar.bz2 nixpkgs-cf830992252ea9105a2e2911e7b82220cf53be65.tar.lz nixpkgs-cf830992252ea9105a2e2911e7b82220cf53be65.tar.xz nixpkgs-cf830992252ea9105a2e2911e7b82220cf53be65.tar.zst nixpkgs-cf830992252ea9105a2e2911e7b82220cf53be65.zip | |
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.
Diffstat (limited to 'pkgs/development/ocaml-modules/eliom')
| -rw-r--r-- | pkgs/development/ocaml-modules/eliom/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index b8d90d0d2b7..92d89afe398 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml, +{ stdenv, lib, fetchzip, fetchpatch, which, ocsigen_server, ocaml, lwt_react, opaline, ppx_deriving, findlib , ocaml-migrate-parsetree @@ -23,6 +23,14 @@ stdenv.mkDerivation rec 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 ocaml-migrate-parsetree js_of_ocaml-ppx_deriving_json opaline |