1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-15 06:52:43 +01:00

Fix floating CA tests

We will sometimes try to query the outputs of derivations we can't
resolve. That's fine; it just means we don't know what those outputs are
yet.
This commit is contained in:
John Ericson 2020-09-04 01:17:38 +00:00
parent 4409530fc9
commit aad4abcc9c
5 changed files with 14 additions and 7 deletions

View file

@ -1460,7 +1460,9 @@ void DerivationGoal::inputsRealised()
/* We are be able to resolve this derivation based on the
now-known results of dependencies. If so, we become a stub goal
aliasing that resolved derivation goal */
Derivation drvResolved { fullDrv.resolve(worker.store) };
std::optional attempt = fullDrv.tryResolve(worker.store);
assert(attempt);
Derivation drvResolved { *std::move(attempt) };
auto pathResolved = writeDerivation(worker.store, drvResolved);
/* Add to memotable to speed up downstream goal's queries with the