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

lib/addCheck: add support for new merge

Browse source
This commit is contained in:
Johannes Kirschbauer 2025-05-30 22:04:52 +02:00
commit 5d72133a22
No known key found for this signature in database
1 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

49
lib/types.nix
View file

@ -20,7 +20,6 @@ let
toList
;
inherit (lib.lists)
all
concatLists
count
elemAt
@ -758,16 +757,14 @@ let
nonEmptyListOf =
elemType:
let
list = types.listOf elemType;
list = addCheck (types.listOf elemType) (l: l != [ ]);
in
addCheck (
list
// {
description = "non-empty ${optionDescriptionPhrase (class: class == "noun") list}";
emptyValue = { }; # no .value attr, meaning unset
substSubModules = m: nonEmptyListOf (elemType.substSubModules m);
}
) (l: l != [ ]);
list
// {
description = "non-empty ${optionDescriptionPhrase (class: class == "noun") list}";
emptyValue = { }; # no .value attr, meaning unset
substSubModules = m: nonEmptyListOf (elemType.substSubModules m);
};
attrsOf = elemType: attrsWith { inherit elemType; };
@ -1500,7 +1497,7 @@ let
} convertible to it";
check = x: (coercedType.check x && finalType.check (coerceFunc x)) || finalType.check x;
merge = {
__funtor =
__functor =
self: loc: defs:
(self.v2 { inherit loc defs; }).value;
v2 =
@ -1558,15 +1555,31 @@ let
*/
addCheck =
elemType: check:
let
final = elemType // {
if elemType.merge ? v2 then
elemType
// {
check = x: elemType.check x && check x;
merge = {
__functor =
self: loc: defs:
(self.v2 { inherit loc defs; }).value;
v2 =
{ loc, defs }:
let
orig = elemType.merge.v2 { inherit loc defs; };
headError' = if orig.headError != null then orig.headError else checkDefsForError check loc defs;
in
orig
// {
headError = headError';
};
};
}
else
elemType
// {
check = x: elemType.check x && check x;
# addCheck discards the merge.v2 function
#
merge = if elemType.merge ? v2 then elemType.merge.__functor { inherit final; } else elemType.merge;
};
in
final;
};
/**