about summary refs log tree commit diff
path: root/pkgs/applications/science
diff options
context:
space:
mode:
authorJoachim Breitner <mail@joachim-breitner.de>2020-03-06 07:42:04 +0100
committerGitHub <noreply@github.com>2020-03-06 07:42:04 +0100
commit2d2a5a9b634e39dec752b112a380055990c3cd35 (patch)
tree9d351f8d2fa1e6fcd56c66540f357c3ae04f6ac3 /pkgs/applications/science
parente8243467b97cb1cb027d03596ec3e4709e140ee2 (diff)
downloadnixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.tar
nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.tar.gz
nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.tar.bz2
nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.tar.lz
nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.tar.xz
nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.tar.zst
nixlib-2d2a5a9b634e39dec752b112a380055990c3cd35.zip
js_of_ocaml: 3.4.0 -> 3.5.2 (#75766)
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 <Vincent.Laporte@gmail.com>
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r--pkgs/applications/science/logic/why3/default.nix10
1 files changed, 8 insertions, 2 deletions
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" ];