public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/generators.toPretty: Wrap in a go function 

As a preparation to the following commit
This commit is contained in:
Silvan Mosberger 2020-09-04 17:23:28 +02:00
parent 0f6231702f
commit 4811f54e94
No known key found for this signature in database
GPG Key ID: E8F1E9EAD284E17D
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/generators.nix
View File

@ -204,7 +204,7 @@ rec {
will use fn to convert val to a pretty printed representation. will use fn to convert val to a pretty printed representation.
(This means fn is type Val -> String.) */ (This means fn is type Val -> String.) */
allowPrettyValues ? false allowPrettyValues ? false
}@args: v: with builtins; }@args: let go = v: with builtins;
let isPath = v: typeOf v == "path"; let isPath = v: typeOf v == "path";
in if isInt v then toString v in if isInt v then toString v
else if isFloat v then "~${toString v}" else if isFloat v then "~${toString v}"
@ -214,7 +214,7 @@ rec {
else if null == v then "null" else if null == v then "null"
else if isPath v then toString v else if isPath v then toString v
else if isList v then "[ " else if isList v then "[ "
+ libStr.concatMapStringsSep " " (toPretty args) v + libStr.concatMapStringsSep " " go v
+ " ]" + " ]"
else if isAttrs v then else if isAttrs v then
# apply pretty values if allowed # apply pretty values if allowed
@ -227,7 +227,7 @@ rec {
else "{ " else "{ "
+ libStr.concatStringsSep " " (libAttr.mapAttrsToList + libStr.concatStringsSep " " (libAttr.mapAttrsToList
(name: value: (name: value:
"${libStr.escapeNixIdentifier name} = ${toPretty args value};") v) "${libStr.escapeNixIdentifier name} = ${go value};") v)
+ " }" + " }"
else if isFunction v then else if isFunction v then
let fna = lib.functionArgs v; let fna = lib.functionArgs v;
@ -237,6 +237,7 @@ rec {
in if fna == {} then "<λ>" in if fna == {} then "<λ>"
else "<λ:{${showFnas}}>" else "<λ:{${showFnas}}>"
else abort "generators.toPretty: should never happen (v = ${v})"; else abort "generators.toPretty: should never happen (v = ${v})";
in go;
# PLIST handling # PLIST handling
toPlist = {}: v: let toPlist = {}: v: let