@@ -328,7 +328,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
328328 Boogie = buildDotnetPackage rec {
329329 baseName = "Boogie";
330330 version = "2.4.1";
331− name = "${baseName}-${version}";
332331
333332 src = fetchFromGitHub {
334333 owner = "boogie-org";
@@ -380,18 +379,21 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
380379 };
381380
382381 Dafny = let
383− z3 = pkgs.z3.overrideAttrs (oldAttrs: with oldAttrs; rec {
382+ z3 = pkgs.z3.overrideAttrs (oldAttrs: rec {
384383 version = "4.8.4";
385− name = "${pname}-${version}";
384+ name = "z3-${version}";
386385
387386 src = fetchFromGitHub {
388387 owner = "Z3Prover";
389− repo = pname;
388+ repo = "z3";
390389 rev = "z3-${version}";
391390 sha256 = "014igqm5vwswz0yhz0cdxsj3a6dh7i79hvhgc3jmmmz3z0xm1gyn";
392391 };
393392 });
394− boogie = assert dotnetPackages.Boogie.version == "2.4.1"; dotnetPackages.Boogie;
393+ self' = pkgs.dotnetPackages.override ({
394+ pkgs = pkgs // { inherit z3; };
395+ });
396+ Boogie = assert self'.Boogie.version == "2.4.1"; self'.Boogie;
395397 in buildDotnetPackage rec {
396398 baseName = "Dafny";
397399 version = "2.3.0";
@@ -428,7 +430,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
428430 # Boogie as an input is not enough. Boogie libraries need to be at the same
429431 # place as Dafny ones. Same for "*.dll.mdb". No idea why or how to fix.
430432 postFixup = ''
431− for lib in ${boogie}/lib/dotnet/${boogie.baseName}/*.dll{,.mdb}; do
433+ for lib in ${Boogie}/lib/dotnet/${Boogie.baseName}/*.dll{,.mdb}; do
432434 ln -s $lib $out/lib/dotnet/${baseName}/
433435 done
434436 # We generate our own executable scripts