From 455e0ed88527d69a9c4a52e1238d35ec61556257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 14 Oct 2018 02:55:00 +0900 Subject: [PATCH] generators: make toPretty handle floats correctly --- lib/generators.nix | 1 + lib/tests/misc.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/generators.nix b/lib/generators.nix index f5faf700786..863ba847423 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -143,6 +143,7 @@ rec { }@args: v: with builtins; let isPath = v: typeOf v == "path"; in if isInt v then toString v + else if isFloat v then "~${toString v}" else if isString v then ''"${libStr.escape [''"''] v}"'' else if true == v then "true" else if false == v then "false" diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index d89bcfde481..853d911cdc8 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -369,6 +369,7 @@ runTests { testToPretty = { expr = mapAttrs (const (generators.toPretty {})) rec { int = 42; + float = 0.1337; bool = true; string = ''fno"rd''; path = /. + "/foo"; @@ -381,6 +382,7 @@ runTests { }; expected = rec { int = "42"; + float = "~0.133700"; bool = "true"; string = ''"fno\"rd"''; path = "/foo";