Fix dependent option sets #82915
Merged
Fix dependent option sets #82915
Conversation
This file contains 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
… option set" This reverts commit 15c873b. This was causing infinite recursion when depending on nested options
ofborg
bot
added
10.rebuild-darwin: 0
|
Can confirm my nixos config evaluates again with this PR, thanks! |
|
Thanks! |
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.
Motivation for this change
As I learned from a report from @arcnmx, 15c873b from #82751 gives infinite recursion for option-dependent configuration with
optionalAttrs, but only with nested option sets. #82802 only added tests for the non-nested case, which is why currently all tests still pass.In this PR I revert the problematic commit and extend @roberth's tests to check for nested options as well, which would fail if the commit wasn't reverted.
Things done