ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

lib/generators.toPretty: Print [] and {} compactly

Browse Source
This commit is contained in:
Silvan Mosberger 2020-09-17 18:14:18 +02:00
parent d0be9e9810
commit 05e4d371ef
No known key found for this signature in database
GPG Key ID: E8F1E9EAD284E17D
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/generators.nix
View File

@ -230,13 +230,16 @@ rec {
else if false == v then "false" else if false == v then "false"
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 "[" + introSpace else if isList v then
if v == [] then "[ ]"
else "[" + introSpace
+ libStr.concatMapStringsSep introSpace (go (indent + " ")) v + libStr.concatMapStringsSep introSpace (go (indent + " ")) v
+ outroSpace + "]" + outroSpace + "]"
else if isAttrs v then else if isAttrs v then
# apply pretty values if allowed # apply pretty values if allowed
if attrNames v == [ "__pretty" "val" ] && allowPrettyValues if attrNames v == [ "__pretty" "val" ] && allowPrettyValues
then v.__pretty v.val then v.__pretty v.val
else if v == {} then "{ }"
else if v ? type && v.type == "derivation" then else if v ? type && v.type == "derivation" then
"<derivation ${v.drvPath}>" "<derivation ${v.drvPath}>"
else "{" + introSpace else "{" + introSpace

4
lib/tests/misc.nix
View File

@ -461,7 +461,9 @@ runTests {
function = x: x; function = x: x;
functionArgs = { arg ? 4, foo }: arg; functionArgs = { arg ? 4, foo }: arg;
list = [ 3 4 function [ false ] ]; list = [ 3 4 function [ false ] ];
emptylist = [];
attrs = { foo = null; "foo bar" = "baz"; }; attrs = { foo = null; "foo bar" = "baz"; };
emptyattrs = {};
drv = deriv; drv = deriv;
}; };
expected = rec { expected = rec {
@ -476,7 +478,9 @@ runTests {
function = "<function>"; function = "<function>";
functionArgs = "<function, args: {arg?, foo}>"; functionArgs = "<function, args: {arg?, foo}>";
list = "[ 3 4 ${function} [ false ] ]"; list = "[ 3 4 ${function} [ false ] ]";
emptylist = "[ ]";
attrs = "{ foo = null; \"foo bar\" = \"baz\"; }"; attrs = "{ foo = null; \"foo bar\" = \"baz\"; }";
emptyattrs = "{ }";
drv = "<derivation ${deriv.drvPath}>"; drv = "<derivation ${deriv.drvPath}>";
}; };
}; };