git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #81608 from layus/dafny-update3

dafny: pin z3 and Boogie version

commit81573a64358c121366c8da519a0abd81a1489ca6 authorAnderson Torres <torres.anderson.85@protonmail.com> dateMon 26 Oct 2020, 08:36 (6 years ago) parentbe4b7367b7efa4
1 file changed+21−6
pkgs/top-level/dotnet-packages.nix+21−6
pkgs/top-level/dotnet-packages.nix+21−6
@@ -327,14 +327,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
327327
328328 Boogie = buildDotnetPackage rec {
329329 baseName = "Boogie";
330− version = "2019-06-20";
331− name = "${baseName}-unstable-${version}";
330+ version = "2.4.1";
332331
333332 src = fetchFromGitHub {
334333 owner = "boogie-org";
335334 repo = "boogie";
336− rev = "2e8fae4dc1724d8f9e7b1f877116e56b0773337e";
337− sha256 = "01wjps3yfx8q0qy0zrmmfd1ixjxi2dhkn1wfazb5qm2slav39dp2";
335+ rev = "v${version}";
336+ sha256 = "13f6ifkh6gpy4bvx5zhgwmk3wd5rfxzl9wxwfhcj1c90fdrhwh1b";
338337 };
339338
340339 # emulate `nuget restore Source/Boogie.sln`
@@ -379,7 +378,23 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
379378 };
380379 };
381380
382− Dafny = buildDotnetPackage rec {
381+ Dafny = let
382+ z3 = pkgs.z3.overrideAttrs (oldAttrs: rec {
383+ version = "4.8.4";
384+ name = "z3-${version}";
385+
386+ src = fetchFromGitHub {
387+ owner = "Z3Prover";
388+ repo = "z3";
389+ rev = "z3-${version}";
390+ sha256 = "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn";
391+ };
392+ });
393+ self' = pkgs.dotnetPackages.override ({
394+ pkgs = pkgs // { inherit z3; };
395+ });
396+ Boogie = assert self'.Boogie.version == "2.4.1"; self'.Boogie;
397+ in buildDotnetPackage rec {
383398 baseName = "Dafny";
384399 version = "2.3.0";
385400
@@ -396,7 +411,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
396411 '';
397412
398413 preBuild = ''
399− ln -s ${pkgs.z3} Binaries/z3
414+ ln -s ${z3} Binaries/z3
400415 '';
401416
402417 buildInputs = [ Boogie ];