[Backport release-25.05] ci/eval: fix local full eval (#442157)

This commit is contained in:
Philip Taron
2025-09-11 21:25:17 +02:00
committed by GitHub
2 changed files with 13 additions and 3 deletions

View File

@@ -13,7 +13,12 @@
byName ? false,
}:
let
combined = builtins.storePath combinedDir;
# Usually we expect a derivation, but when evaluating in multiple separate steps, we pass
# nix store paths around. These need to be turned into (fake) derivations again to track
# dependencies properly.
# We use two steps for evaluation, because we compare results from two different checkouts.
# CI additionalls spreads evaluation across multiple workers.
combined = if lib.isDerivation combinedDir then combinedDir else lib.toDerivation combinedDir;
/*
Derivation that computes which packages are affected (added, changed or removed) between two revisions of nixpkgs.

View File

@@ -11,8 +11,13 @@
}:
let
before = builtins.storePath beforeDir;
after = builtins.storePath afterDir;
# Usually we expect a derivation, but when evaluating in multiple separate steps, we pass
# nix store paths around. These need to be turned into (fake) derivations again to track
# dependencies properly.
# We use two steps for evaluation, because we compare results from two different checkouts.
# CI additionalls spreads evaluation across multiple workers.
before = if lib.isDerivation beforeDir then beforeDir else lib.toDerivation beforeDir;
after = if lib.isDerivation afterDir then afterDir else lib.toDerivation afterDir;
/*
Computes the key difference between two attrs