Don't pass resolved_drv to the builder#1620
Closed
artemist wants to merge 1 commit intoNixOS:masterfrom
Closed
Conversation
Ericson2314
reviewed
Mar 30, 2026
| pub async fn new(store: &nix_utils::LocalStore, step: Arc<Step>) -> Self { | ||
| pub async fn new(step: Arc<Step>) -> Self { | ||
| Self { | ||
| resolved_drv_path: store.try_resolve_drv(step.get_drv_path()).await, |
Member
There was a problem hiding this comment.
don't want to lose this. We can just monkey patch the step to have the right drv?
Member
Author
There was a problem hiding this comment.
Patching Step is somewhat challenging. It would be easier to patch Job, which is the first part of sending to a builder.
artemist
force-pushed
the
remove-builder-resolution
branch
from
757329b to
ec8f54f
Compare
The builder should only ever be given a resolved derivation, and we can name that drv.
artemist
force-pushed
the
remove-builder-resolution
branch
from
ec8f54f to
7d17df2
Compare
Member
Author
|
Strange, the tests worked locally on x86_64. Content addressed is what changed here, but I expected it would work. |
Member
Author
|
I think the issue is that we made |
Member
|
Superceded by #1629, I believe. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Whenever possible, only a resolved derivation should be passed around. Remove all the separation between "resolved" and "unresolved" derivation past
Job, including in the builder.