diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2021-02-01 16:31:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-01 16:31:48 +0100 |
| commit | 6cd12f979488917368d031644bb5ddc17142add9 (patch) | |
| tree | 958a3a629b713924dfcc8ba22e7773847a6da7bc | |
| parent | 9ff91f967cb6ad74bb621f5dfa07ce42a83c29dc (diff) | |
| parent | 06d3b2898717877bb23ae32467dbebba9f307ac4 (diff) | |
Merge pull request #111577 from sternenseemann/revert-generators
Revert "lib/generators: fix toPretty throwing on (partially applied) builtins"
| -rw-r--r-- | lib/generators.nix | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/generators.nix b/lib/generators.nix index 9546f5b5b0ab9..501a23599f45e 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -236,17 +236,12 @@ rec { + libStr.concatMapStringsSep introSpace (go (indent + " ")) v + outroSpace + "]" else if isFunction v then - # 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); + let fna = lib.functionArgs v; showFnas = concatStringsSep ", " (libAttr.mapAttrsToList (name: hasDefVal: if hasDefVal then name + "?" else name) - fna.value); - in if !fna.success || fna.value == {} - then "<function>" - else "<function, args: {${showFnas}}>" + fna); + in if fna == {} then "<function>" + else "<function, args: {${showFnas}}>" else if isAttrs v then # apply pretty values if allowed if attrNames v == [ "__pretty" "val" ] && allowPrettyValues |