chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-11 10:22:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

lib.types.attrTag: expose suboptions at correct level

Browse Source 
(cherry picked from commit b3c9916455)
This commit is contained in:
sodiboo
2025-06-22 21:23:18 +02:00
committed by github-actions[bot]
parent 368f9b6bf7
commit 7c871446f4
2 changed files with 2 additions and 7 deletions
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
inherit (lib) mkOption types;
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
{
options = {

7
lib/types.nix
View File

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