talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

lib.types.attrTag: expose suboptions at correct level

Browse Source
This commit is contained in:
sodiboo 2025-06-22 21:23:18 +02:00
parent 9f7c0e8a7e
commit b3c9916455
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tests/modules/types-attrTag.nix
View File

@ -7,7 +7,7 @@
let let
inherit (lib) mkOption types; inherit (lib) mkOption types;
forceDeep = x: builtins.deepSeq x x; forceDeep = x: builtins.deepSeq x x;
mergedSubOption = (options.merged.type.getSubOptions options.merged.loc).extensible."merged.<name>"; mergedSubOption = (options.merged.type.getSubOptions options.merged.loc).extensible;
in in
{ {
options = { options = {

7
lib/types.nix
View File

@ -919,12 +919,7 @@ let
description = "attribute-tagged union"; description = "attribute-tagged union";
descriptionClass = "noun"; descriptionClass = "noun";
getSubOptions = getSubOptions =
prefix: prefix: mapAttrs (tagName: tagOption: tagOption // { loc = prefix ++ [ tagName ]; }) tags;
mapAttrs (tagName: tagOption: {
"${lib.showOption prefix}" = tagOption // {
loc = prefix ++ [ tagName ];
};
}) tags;
check = v: isAttrs v && length (attrNames v) == 1 && tags ? ${head (attrNames v)}; check = v: isAttrs v && length (attrNames v) == 1 && tags ? ${head (attrNames v)};
merge = merge =
loc: defs: loc: defs: