c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

Module system types.attrTag implement declaration info in options (#531031)

Browse source
This commit is contained in:
Matt Sturgeon 2026-07-02 12:38:20 +00:00 • committed by GitHub
commit c00644f728
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/tests/modules/types-attrTag.nix
View file

@ -120,7 +120,17 @@ in
assert config.merged.positive == { yay = 100; };
assert config.merged.extensi-foo == { extensible = "foo"; };
assert config.merged.extensi-bar == { extensible = "bar"; };
assert config.docs."submodules.<name>.foo.bar".declarations == [ __curPos.file ];
assert config.docs."submodules.<name>.foo.bar".type == "signed integer";
assert
lib.length
(options.submodules.type.nestedTypes.elemType.nestedTypes.foo.type.getSubOptions [ ])
.bar.declarationPositions == 1;
assert
(lib.head
(options.submodules.type.nestedTypes.elemType.nestedTypes.foo.type.getSubOptions [ ])
.bar.declarationPositions
).file == __curPos.file;
assert config.docs."submodules.<name>.qux".type == "string";
assert config.docs."submodules.<name>.qux".declarations == [ __curPos.file ];
assert
@ -133,8 +143,11 @@ in
assert config.docs."submodules.<name>.qux".description == "A qux for when you don't want a foo";
assert config.docs."submodules.<name>.qux".readOnly == false;
assert config.docs."submodules.<name>.qux".visible == true;
# Not available (yet?)
# assert config.docs."submodules.<name>.qux".declarationsWithPositions == [ ... ];
assert
lib.length options.submodules.type.nestedTypes.elemType.nestedTypes.qux.declarationPositions == 1;
assert
(lib.head options.submodules.type.nestedTypes.elemType.nestedTypes.qux.declarationPositions).file
== __curPos.file;
assert options.submodules.declarations == [ __curPos.file ];
assert lib.length options.submodules.declarationPositions == 1;
assert (lib.head options.submodules.declarationPositions).file == __curPos.file;

21
lib/types.nix
View file

@ -1140,6 +1140,27 @@ rec {
else
throw "The option `${showOption loc}` is defined as ${lib.strings.escapeNixIdentifier choice}, but ${lib.strings.escapeNixIdentifier choice} is not among the valid choices (${choicesStr}). Value ${choice} was defined in ${showFiles (getFiles defs)}.";
nestedTypes = tags;
getSubModules =
let
tagsWithSubModules = filterAttrs (_: mods: mods != null) (
mapAttrs (_: opt: opt.type.getSubModules) tags
);
in
if tagsWithSubModules == { } then null else [ tagsWithSubModules ];
substSubModules =
allWrappedModules:
let
tagsWithNewTypes = zipAttrsWith (tag: tags.${tag}.type.substSubModules) (
concatMap (
{ _file, imports }: map (mapAttrs (_: imports: { inherit _file imports; })) imports
) allWrappedModules
);
in
attrTag (
mapAttrs (
tag: opt: opt // (optionalAttrs (tagsWithNewTypes ? ${tag}) { type = tagsWithNewTypes.${tag}; })
) tags
);
functor = defaultFunctor "attrTag" // {
type = { tags, ... }: lib.types.attrTag tags;
payload = { inherit tags; };