diff options
103 files changed, 2329 insertions, 681 deletions
diff --git a/lib/generators.nix b/lib/generators.nix index 501a23599f45..9546f5b5b0ab 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -236,12 +236,17 @@ rec { + libStr.concatMapStringsSep introSpace (go (indent + " ")) v + outroSpace + "]" else if isFunction v then - let fna = lib.functionArgs v; + # functionArgs throws in case of (partially applied) builtins + # on nix before commit b2748c6e99239ff6803ba0da76c362790c8be192 + # which includes current nix stable + # TODO remove tryEval workaround when the issue is resolved on nix stable + let fna = builtins.tryEval (lib.functionArgs v); showFnas = concatStringsSep ", " (libAttr.mapAttrsToList (name: hasDefVal: if hasDefVal then name + "?" else name) - fna); - in if fna == {} then "<function>" - else "<function, args: {${showFnas}}>" + fna.value); + in if !fna.success || fna.value == {} + then "<function>" + else "<function, args: {${showFnas}}>" else if isAttrs v then # apply pretty values if allowed if attrNames v == [ "__pretty" "val" ] && allowPrettyValues diff --git a/lib/types.nix b/lib/types.nix index 77245158d9f8..d0a8e96149d7 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -454,7 +454,8 @@ rec { }; functionTo = elemType: mkOptionType { - name = "function that evaluates to a(n) ${elemType.name}"; + name = "functionTo"; + description = "function that evaluates to a(n) ${elemType.name}"; check = isFunction; merge = loc: defs: fnArgs: (mergeDefinitions (loc ++ [ "[function body]" ]) elemType (map (fn: { inherit (fn) file; value = fn.value fnArgs; }) defs)).mergedValue; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cdc036823b44..a6c6c547aedc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -868,6 +868,12 @@ githubId = 706854; name = "Etienne Laurin"; }; + attila-lendvai = { + name = "Attila Lendvai"; + email = "attila@lendvai.name"; + github = "attila-lendvai"; + githubId = 840345; + }; auntie = { email = "auntieNeo@gmail.com"; github = "auntieNeo"; @@ -8661,6 +8667,12 @@ githubId = 7669898; name = "Katharina Fey"; }; + spease = { + email = "peasteven@gmail.com"; + github = "spease"; + githubId = 2825204; + name = "Steve |