NixNAR: cope with compress_num_threads being declared twice - #1837
Open
vmfunc wants to merge 1 commit into
Open
Conversation
Config::General turns duplicate config keys into an array ref, and the NixOS module always declares compress_num_threads, so a second declaration in extraConfig ended up interpolating ARRAY(0x...) into the pixz command line and broke NAR serving with a shell syntax error. Take the last declared value in that case, and drop anything non-numeric instead of splicing it into the shell command. Fixes NixOS#1389
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
1 participant
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.
Fixes #1389.
Config::General turns duplicate config keys into an array ref. The NixOS module always sets
compress_num_threads, so setting it again inextraConfigended up interpolatingARRAY(0x...)into the pixz command line and broke/nar/serving with a shell syntax error.This takes the last declared value, and also refuses to pass anything non-numeric into the shell command. Added a small unit test for the new helper.