diff --git a/lib/generators.nix b/lib/generators.nix index 716ae77973f..501a23599f4 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -235,6 +235,13 @@ rec { else "[" + introSpace + libStr.concatMapStringsSep introSpace (go (indent + " ")) v + outroSpace + "]" + else if isFunction v then + let fna = lib.functionArgs v; + showFnas = concatStringsSep ", " (libAttr.mapAttrsToList + (name: hasDefVal: if hasDefVal then name + "?" else name) + fna); + in if fna == {} then "" + else "" else if isAttrs v then # apply pretty values if allowed if attrNames v == [ "__pretty" "val" ] && allowPrettyValues @@ -247,13 +254,6 @@ rec { (name: value: "${libStr.escapeNixIdentifier name} = ${go (indent + " ") value};") v) + outroSpace + "}" - else if isFunction v then - let fna = lib.functionArgs v; - showFnas = concatStringsSep ", " (libAttr.mapAttrsToList - (name: hasDefVal: if hasDefVal then name + "?" else name) - fna); - in if fna == {} then "" - else "" else abort "generators.toPretty: should never happen (v = ${v})"; in go "";