forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'NixOS:master' into master
- Loading branch information
Showing
275 changed files
with
5,678 additions
and
17,122 deletions.
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| { lib, ... }: | ||
| let | ||
| inherit (lib) types mkOption; | ||
| in | ||
| { | ||
| imports = [ | ||
| # Module A | ||
| ( | ||
| { ... }: | ||
| { | ||
| options.mergedName = mkOption { | ||
| default = { }; | ||
| type = types.attrsWith { | ||
| placeholder = "id"; # <- This is beeing tested | ||
| elemType = types.submodule { | ||
| options.nested = mkOption { | ||
| type = types.int; | ||
| default = 1; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| } | ||
| ) | ||
| # Module B | ||
| ( | ||
| { ... }: | ||
| { | ||
| # defines the default placeholder "name" | ||
| # type merging should resolve to "id" | ||
| options.mergedName = mkOption { | ||
| type = types.attrsOf (types.submodule { }); | ||
| }; | ||
| } | ||
| ) | ||
|
|
||
| # Output | ||
| ( | ||
| { | ||
| options, | ||
| ... | ||
| }: | ||
| { | ||
| options.result = mkOption { | ||
| default = lib.concatStringsSep "." (options.mergedName.type.getSubOptions options.mergedName.loc) | ||
| .nested.loc; | ||
| }; | ||
| } | ||
| ) | ||
| ]; | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| { lib, ... }: | ||
| let | ||
| inherit (lib) types mkOption; | ||
| in | ||
| { | ||
| imports = [ | ||
| # Module A | ||
| ( | ||
| { ... }: | ||
| { | ||
| options.mergedName = mkOption { | ||
| default = { }; | ||
| type = types.attrsWith { | ||
| placeholder = "id"; # <- this is beeing tested | ||
| elemType = types.submodule { | ||
| options.nested = mkOption { | ||
| type = types.int; | ||
| default = 1; | ||
| }; | ||
| }; | ||
| }; | ||
| }; | ||
| } | ||
| ) | ||
| # Module B | ||
| ( | ||
| { ... }: | ||
| { | ||
| options.mergedName = mkOption { | ||
| type = types.attrsWith { | ||
| placeholder = "other"; # <- define placeholder = "other" (conflict) | ||
| elemType = types.submodule { }; | ||
| }; | ||
| }; | ||
| } | ||
| ) | ||
| ]; | ||
| } |
Oops, something went wrong.