cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #173542 from vbgl/why3-1.5.0

Browse source
This commit is contained in:
Ben Siraphob 2022-05-18 16:24:53 -07:00 committed by GitHub
commit de5224fe21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/science/logic/easycrypt/default.nix
View file

@ -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

4
pkgs/applications/science/logic/why3/default.nix
View file

@ -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; [

2
pkgs/applications/science/logic/why3/with-provers.nix
View file

@ -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"
'';
}

9
pkgs/development/tools/analysis/frama-c/default.nix
View file

@ -4,6 +4,15 @@
, gdk-pixbuf, wrapGAppsHook
}:
let why3_1_5 = why3; in
let why3 = why3_1_5.overrideAttrs (o: rec {
version = "1.4.1";
src = fetchurl {
url = "https://why3.gitlabpages.inria.fr/releases/${o.pname}-${version}.tar.gz";
sha256 = "sha256:1rqyypzlvagrn43ykl0c5wxyvnry5fl1ykn3xcvlzgghk96yq3jq";
};
}); in
let
mkocamlpath = p: "${p}/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib";
runtimeDeps = with ocamlPackages; [