public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dafny: use pinned z3 in the full closure

Browse Source
This commit is contained in:
Guillaume Maudoux 2020-10-24 17:03:20 +02:00
parent 7769e32006
commit 7b7efa47e7
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/top-level/dotnet-packages.nix
View File

@ -328,7 +328,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
Boogie = buildDotnetPackage rec { Boogie = buildDotnetPackage rec {
baseName = "Boogie"; baseName = "Boogie";
version = "2.4.1"; version = "2.4.1";
name = "${baseName}-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "boogie-org"; owner = "boogie-org";
@ -380,18 +379,21 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
}; };
Dafny = let Dafny = let
z3 = pkgs.z3.overrideAttrs (oldAttrs: with oldAttrs; rec { z3 = pkgs.z3.overrideAttrs (oldAttrs: rec {
version = "4.8.4"; version = "4.8.4";
name = "${pname}-${version}"; name = "z3-${version}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Z3Prover"; owner = "Z3Prover";
repo = pname; repo = "z3";
rev = "z3-${version}"; rev = "z3-${version}";
sha256 = "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn"; sha256 = "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn";
}; };
}); });
boogie = assert dotnetPackages.Boogie.version == "2.4.1"; dotnetPackages.Boogie; self' = pkgs.dotnetPackages.override ({
pkgs = pkgs // { inherit z3; };
});
Boogie = assert self'.Boogie.version == "2.4.1"; self'.Boogie;
in buildDotnetPackage rec { in buildDotnetPackage rec {
baseName = "Dafny"; baseName = "Dafny";
version = "2.3.0"; version = "2.3.0";
@ -428,7 +430,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
# Boogie as an input is not enough. Boogie libraries need to be at the same # Boogie as an input is not enough. Boogie libraries need to be at the same
# place as Dafny ones. Same for "*.dll.mdb". No idea why or how to fix. # place as Dafny ones. Same for "*.dll.mdb". No idea why or how to fix.
postFixup = '' postFixup = ''
for lib in ${boogie}/lib/dotnet/${boogie.baseName}/*.dll{,.mdb}; do for lib in ${Boogie}/lib/dotnet/${Boogie.baseName}/*.dll{,.mdb}; do
ln -s $lib $out/lib/dotnet/${baseName}/ ln -s $lib $out/lib/dotnet/${baseName}/
done done
# We generate our own executable scripts # We generate our own executable scripts