nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00
Code Activity

Merge pull request #14449 from roberth/error-resolution-failed

Browse source 
Improve "resolution failed" error
This commit is contained in:
Sergei Zimmerman 2025-11-02 15:00:56 +00:00 • committed by GitHub
commit e0debd61d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build/derivation-goal.cc
View file

@ -147,7 +147,7 @@ Goal::Co DerivationGoal::haveDerivation(bool storeDerivation)
co_await await(std::move(waitees)); co_await await(std::move(waitees));
} }
if (nrFailed != 0) { if (nrFailed != 0) {
co_return doneFailure({BuildResult::Failure::DependencyFailed, "resolution failed"}); co_return doneFailure({BuildResult::Failure::DependencyFailed, "Build failed due to failed dependency"});
} }
if (resolutionGoal->resolvedDrv) { if (resolutionGoal->resolvedDrv) {

1
tests/functional/build.sh
View file

@ -184,6 +184,7 @@ test "$status" = 1
if isDaemonNewer "2.29pre"; then if isDaemonNewer "2.29pre"; then
<<<"$out" grepQuiet -E "error: Cannot build '.*-x4\\.drv'" <<<"$out" grepQuiet -E "error: Cannot build '.*-x4\\.drv'"
<<<"$out" grepQuiet -E "Reason: 1 dependency failed." <<<"$out" grepQuiet -E "Reason: 1 dependency failed."
<<<"$out" grepQuiet -E "Build failed due to failed dependency"
else else
<<<"$out" grepQuiet -E "error: 1 dependencies of derivation '.*-x4\\.drv' failed to build" <<<"$out" grepQuiet -E "error: 1 dependencies of derivation '.*-x4\\.drv' failed to build"
fi fi