[nix] Fix profile list index for raw flakes #1471
Merged
Conversation
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
savil
approved these changes
Sep 12, 2023
internal/nix/nixprofile/profile.go
Outdated
| for _, item := range items { | ||
| if ref == item.unlockedReference { | ||
| return item.index, nil | ||
| } |
There was a problem hiding this comment.
I'd rather implement this as:
if !inCache && args.Package.IsDevboxPackage() {
...
return -1, errors.Wrap(nix.ErrPackageNotFound, args.Package.String())
}
so that the if-statement does not fallthrough and we don't have to consider DevboxPackages when reasoning about the code below.
Alternatively, is this optimization saving meaningful time? If not, lets drop it.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
ProfileListIndex was broken for raw flakes. This would break
devbox updateI could have left the
return -1, errors.Wrap(nix.ErrPackageNotFound, args.Package.String())inside the if statement, but it seems safer to just to attempt the slow matching instead of returning an error and only returning an error after all matching fails.Blame PR: #1422
How was it tested?