busybox-sandbox-shell: fix eval for musl#361265
Merged
K900 merged 1 commit intoNixOS:masterfrom Dec 3, 2024
Merged
Conversation
Setting useMusl all the time to a condition dependent on isGnu meant that for musl platforms, useMusl ended up being set to false, tripping the assertion in the busybox expression. The correct thing to do is to leave useMusl at its default value, except for in the specific case where we want to force it to true. Fixes: 11472f0 ("busybox-sandbox-shell: replace pkgsStatic with useMusl")
13 tasks
github-actions
bot
added
10.rebuild-darwin: 0
szlend
approved these changes
Dec 3, 2024
wolfgangwalther
approved these changes
Dec 3, 2024
Contributor
wolfgangwalther
left a comment
wolfgangwalther
left a comment
There was a problem hiding this comment.
Uh, right, thanks for fixing!
Member
|
Is it a problem if the regression reaches |
Member
|
Probably safer to re-eval, or is that a last resort thing? It should only break |
Member
|
The channel update is activating already now. |
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
5 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.
Setting useMusl all the time to a condition dependent on isGnu meant that for musl platforms, useMusl ended up being set to false, tripping the assertion in the busybox expression. The correct thing to do is to leave useMusl at its default value, except for in the specific case where we want to force it to true.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.