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

lib/generators: improve toPretty 

* properly escape strings
* remove one check for booleans
* improve error message
This commit is contained in:
Profpatsch 2018-03-26 17:26:20 +02:00
parent e0ae89007b
commit 219ba583b2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/generators.nix
View File

@ -98,6 +98,7 @@ rec {
*/ */
toYAML = {}@args: toJSON args; toYAML = {}@args: toJSON args;
/* Pretty print a value, akin to `builtins.trace`. /* Pretty print a value, akin to `builtins.trace`.
* Should probably be a builtin as well. * Should probably be a builtin as well.
*/ */
@ -108,8 +109,9 @@ rec {
allowPrettyValues ? false allowPrettyValues ? false
}@args: v: with builtins; }@args: v: with builtins;
if isInt v then toString v if isInt v then toString v
else if isBool v then (if v == true then "true" else "false") else if isString v then ''"${libStr.escape [''"''] v}"''
else if isString v then "\"" + v + "\"" else if true == v then "true"
else if false == v then "false"
else if null == v then "null" else if null == v then "null"
else if isFunction v then else if isFunction v then
let fna = lib.functionArgs v; let fna = lib.functionArgs v;
@ -132,6 +134,6 @@ rec {
(name: value: (name: value:
"${toPretty args name} = ${toPretty args value};") v) "${toPretty args name} = ${toPretty args value};") v)
+ " }" + " }"
else abort "toPretty: should never happen (v = ${v})"; else abort "generators.toPretty: should never happen (v = ${v})";
} }