lib.types.submoduleWith: Avoid _key collisions after extendModules (issue #168767)#168778
Merged
roberth merged 1 commit intoNixOS:masterfrom Apr 26, 2022
Conversation
93612b0 to
224426b
Compare
roberth
commented
Apr 23, 2022
| # moduleType | ||
| checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-variant.nix | ||
| checkConfigOutput '^"a y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix | ||
| checkConfigOutput '^"a b y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix |
Member
Author
There was a problem hiding this comment.
I didn't recognize the problem at the time.
The assertion looks for attrNames config.variants.foo.variants.bar.attrs.
attrs.a = 1;
variants.foo.attrs.b = 1;
variants.bar.attrs.y = 1;
variants.foo.variants.bar.attrs.z = 1;
variants.foo.variants.foo.attrs.c = 3;
b occurs in the foo variant, so it should also occur in the foo+bar variant.
lib.types.submoduleWith: Avoid _key collisions after extendModules (issue #168767)
Member
Author
|
Ping @infinisil |
13 tasks
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
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.
This fixes module key collisions induced by extendModules
when using anonymous modules.
TODO
consider more elegant solution, like calling unifyModuleSyntax in evalModules instead of in submoduleWithDescription of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes