movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

lib.types.functionTo: preserve functionArgs

Browse source 
Previously if function in defs had set pattern in argument,
this information would be lost.

This keeps functionArgs in set pattern,
by using functor and `__functionArgs`
that is later used by `lib.functionArgs`.
This commit is contained in:
Wroclaw 2025-03-01 18:16:38 +01:00
parent 2d1fce7ff9
commit 0de1d18795
2 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/tests/misc.nix
View file

@ -2521,6 +2521,21 @@ runTests {
expr = (with types; either int (listOf (either bool str))).description; expr = (with types; either int (listOf (either bool str))).description;
expected = "signed integer or list of (boolean or string)"; expected = "signed integer or list of (boolean or string)";
}; };
testTypeFunctionToPropagateFunctionArgs = {
expr = lib.functionArgs ((types.functionTo types.null).merge [] [
{
value = {a, b ? false, ... }: null;
}
{
value = {b, c ? false, ... }: null;
}
]);
expected = {
a = false;
b = false;
c = true;
};
};
# Meta # Meta
testGetExe'Output = { testGetExe'Output = {

9
lib/types.nix
View file

@ -873,8 +873,13 @@ rec {
description = "function that evaluates to a(n) ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}"; description = "function that evaluates to a(n) ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}";
descriptionClass = "composite"; descriptionClass = "composite";
check = isFunction; check = isFunction;
merge = loc: defs: merge = loc: defs: {
fnArgs: (mergeDefinitions (loc ++ [ "<function body>" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue; # An argument attribute has a default when it has a default in all definitions
__functionArgs = lib.zipAttrsWith (_: lib.all (x: x)) (
lib.map (fn: lib.functionArgs fn.value) defs
);
__functor = _: callerArgs: (mergeDefinitions (loc ++ [ "<function body>" ]) elemType (map (fn: { inherit (fn) file; value = fn.value callerArgs; }) defs)).mergedValue;
};
getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "<function body>" ]); getSubOptions = prefix: elemType.getSubOptions (prefix ++ [ "<function body>" ]);
getSubModules = elemType.getSubModules; getSubModules = elemType.getSubModules;
substSubModules = m: functionTo (elemType.substSubModules m); substSubModules = m: functionTo (elemType.substSubModules m);