Skip to content

Commit

Permalink
why3: 1.2.1 -> 1.3.1
Browse files Browse the repository at this point in the history
Important: keeping why3 at 1.2.1 precludes framac 21.+ from having WP
plugin enabled, which is arguably a very important plugin.
  • Loading branch information
yrashk authored and bjornfor committed Jul 30, 2020
1 parent 39910f4 commit cc8369c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 23 deletions.
11 changes: 0 additions & 11 deletions pkgs/applications/science/logic/why3/configure.patch

This file was deleted.

15 changes: 3 additions & 12 deletions pkgs/applications/science/logic/why3/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

stdenv.mkDerivation {
pname = "why3";
version = "1.2.1";
version = "1.3.1";

src = fetchurl {
url = "https://gforge.inria.fr/frs/download.php/file/38185/why3-1.2.1.tar.gz";
sha256 = "014gkwisjp05x3342zxkryb729p02ngx1hcjjsrplpa53jzgz647";
url = "https://gforge.inria.fr/frs/download.php/file/38291/why3-1.3.1.tar.gz";
sha256 = "16zcrc60zz2j3gd3ww93z2z9x2jkxb3kr57y8i5rcgmacy7mw3bv";
};

buildInputs = with ocamlPackages; [
Expand All @@ -29,15 +29,6 @@ stdenv.mkDerivation {

enableParallelBuilding = true;

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

postPatch = ''
substituteInPlace Makefile.in --replace js_of_ocaml.ppx js_of_ocaml-ppx
'';
Expand Down

0 comments on commit cc8369c

Please sign in to comment.