From 2d2a5a9b634e39dec752b112a380055990c3cd35 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Fri, 6 Mar 2020 07:42:04 +0100 Subject: js_of_ocaml: 3.4.0 -> 3.5.2 (#75766) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit drive-by contributions, as I was playing around with this (it has better support for the `num` library, it seems.) js_of_ocaml: 3.4.0 -> 3.5.2 ocamlPackages.js_of_ocaml-ppx_deriving_json: use ppxlib-0.12.0 ocamlPackages.eliom: 6.8.0 → 6.10.1 ocamlPackages.ocsigen-toolkit: 2.2.0 → 2.5.0 ocamlPackages.ocsigen-start: 2.7.0 → 2.16.1 Co-authored-by: Vincent Laporte --- pkgs/applications/science/logic/why3/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/science') diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index eeb3a6b6d361..e57644618196 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl, stdenv +{ callPackage, fetchurl, fetchpatch, stdenv , ocamlPackages, coqPackages, rubber, hevea, emacs }: stdenv.mkDerivation { @@ -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" ]; -- cgit 1.4.1