about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorSilvan Mosberger <contact@infinisil.com>2020-09-04 17:19:55 +0200
committerSilvan Mosberger <contact@infinisil.com>2020-09-17 18:20:08 +0200
commit0f6231702fc1ccde0130bcbf297ff415d17b06d8 (patch)
treeb616eaf1967fdd8093fd864fbd38f4190368d7b9 /lib
parentf3bf0f173ec9b302c2613dfb6d76dc49b889f321 (diff)
lib/generators.toPretty: Only quote attribute names if necessary
Diffstat (limited to 'lib')
-rw-r--r--lib/generators.nix2
-rw-r--r--lib/tests/misc.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/generators.nix b/lib/generators.nix
index abd237eb7d377..800ef5be4fcd0 100644
--- a/lib/generators.nix
+++ b/lib/generators.nix
@@ -227,7 +227,7 @@ rec {
       else "{ "
           + libStr.concatStringsSep " " (libAttr.mapAttrsToList
               (name: value:
-                "${toPretty args name} = ${toPretty args value};") v)
+                "${libStr.escapeNixIdentifier name} = ${toPretty args value};") v)
         + " }"
     else if isFunction v then
       let fna = lib.functionArgs v;
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index b066f577f323b..7d7380e8b74bd 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -469,7 +469,7 @@ runTests {
       function = "<λ>";
       functionArgs = "<λ:{(arg),foo}>";
       list = "[ 3 4 ${function} [ false ] ]";
-      attrs = "{ \"foo\" = null; \"foo bar\" = \"baz\"; }";
+      attrs = "{ foo = null; \"foo bar\" = \"baz\"; }";
       drv = "<δ:test>";
     };
   };