diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-19 00:02:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-19 00:02:14 +0000 |
| commit | 17dfec360625ea918b79179fdc0c85e55d59f3d6 (patch) | |
| tree | c2dfbe8977f292a8d16a5a304d9ca80b78c6e27b /pkgs/applications/science/logic | |
| parent | 925219f62bae53c1c03be0fbf2617ce40b28af0f (diff) | |
| parent | 8124bc2c65dabe5363fc59fa6c16422f5c556dda (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science/logic')
| -rw-r--r-- | pkgs/applications/science/logic/easycrypt/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/why3/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/science/logic/why3/with-provers.nix | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index 5f28ca73c4e73..da4ff212e294b 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, ocamlPackages, why3 }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, ocamlPackages, why3 }: stdenv.mkDerivation rec { pname = "easycrypt"; @@ -11,6 +11,12 @@ stdenv.mkDerivation rec { sha256 = "sha256:09rdwcj70lkamkhd895p284rfpz4bcnsf55mcimhiqncd2a21ml7"; }; + # Fix build with Why3 1.5 + patches = fetchpatch { + url = "https://github.com/EasyCrypt/easycrypt/commit/d226387432deb7f22738e1d5579346a2cbc9be7a.patch"; + sha256 = "sha256:1zvxij35fnr3h9b5wdl8ml17aqfx3a39rd4mgwmdvkapbg3pa4lm"; + }; + nativeBuildInputs = with ocamlPackages; [ dune_3 findlib diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 0f3dab8038eeb..8917135b2c88c 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "why3"; - version = "1.4.1"; + version = "1.5.0"; src = fetchurl { url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256:1rqyypzlvagrn43ykl0c5wxyvnry5fl1ykn3xcvlzgghk96yq3jq"; + sha256 = "sha256:0qjh49pyqmg3xi09fn4lyzz23i6h18y9sgc8ayscvx3bwr3vcqhr"; }; buildInputs = with ocamlPackages; [ diff --git a/pkgs/applications/science/logic/why3/with-provers.nix b/pkgs/applications/science/logic/why3/with-provers.nix index ae0acb1e525c8..739064bb61698 100644 --- a/pkgs/applications/science/logic/why3/with-provers.nix +++ b/pkgs/applications/science/logic/why3/with-provers.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin - makeWrapper ${why3}/bin/why3 $out/bin/why3 --add-flags "--extra-config $out/share/why3/why3.conf" + makeWrapper ${why3}/bin/why3 $out/bin/why3 --add-flags "--config $out/share/why3/why3.conf" ''; } |