git.iko.soy/typeable/nixpkgs
on master help sign in
dafny: pin z3 and Boogie version
commit7769e32006a5af1155a862a96a7a2924243586a7 authorGuillaume Maudoux <layus.on@gmail.com> dateTue 3 Mar 2020, 11:50 (7 years ago) parent7ecdf14
1 file changed+20−7
pkgs/top-level/dotnet-packages.nix+20−7
pkgs/top-level/dotnet-packages.nix+20−7
@@ -327,14 +327,14 @@ 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";
331+ name = "${baseName}-${version}";
332332
333333 src = fetchFromGitHub {
334334 owner = "boogie-org";
335335 repo = "boogie";
336− rev = "2e8fae4dc1724d8f9e7b1f877116e56b0773337e";
337− sha256 = "01wjps3yfx8q0qy0zrmmfd1ixjxi2dhkn1wfazb5qm2slav39dp2";
336+ rev = "v${version}";
337+ sha256 = "13f6ifkh6gpy4bvx5zhgwmk3wd5rfxzl9wxwfhcj1c90fdrhwh1b";
338338 };
339339
340340 # emulate `nuget restore Source/Boogie.sln`
@@ -379,7 +379,20 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
379379 };
380380 };
381381
382− Dafny = buildDotnetPackage rec {
382+ Dafny = let
383+ z3 = pkgs.z3.overrideAttrs (oldAttrs: with oldAttrs; rec {
384+ version = "4.8.4";
385+ name = "${pname}-${version}";
386+
387+ src = fetchFromGitHub {
388+ owner = "Z3Prover";
389+ repo = pname;
390+ rev = "z3-${version}";
391+ sha256 = "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn";
392+ };
393+ });
394+ boogie = assert dotnetPackages.Boogie.version == "2.4.1"; dotnetPackages.Boogie;
395+ in buildDotnetPackage rec {
383396 baseName = "Dafny";
384397 version = "2.3.0";
385398
@@ -396,7 +409,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
396409 '';
397410
398411 preBuild = ''
399− ln -s ${pkgs.z3} Binaries/z3
412+ ln -s ${z3} Binaries/z3
400413 '';
401414
402415 buildInputs = [ Boogie ];
@@ -415,7 +428,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
415428 # Boogie as an input is not enough. Boogie libraries need to be at the same
416429 # place as Dafny ones. Same for "*.dll.mdb". No idea why or how to fix.
417430 postFixup = ''
418− for lib in ${Boogie}/lib/dotnet/${Boogie.baseName}/*.dll{,.mdb}; do
431+ for lib in ${boogie}/lib/dotnet/${boogie.baseName}/*.dll{,.mdb}; do
419432 ln -s $lib $out/lib/dotnet/${baseName}/
420433 done
421434 # We generate our own executable scripts