From b98ea4560899470536506426a74704a907fcfc8f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 10 Feb 2020 15:25:24 +0100
Subject: [PATCH] nixos-version --json: Use builtins.toJSON

---
 nixos/modules/installer/tools/nixos-version.sh | 2 +-
 nixos/modules/installer/tools/tools.nix        | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh
index 0117aa1549c..2711bc1e131 100644
--- a/nixos/modules/installer/tools/nixos-version.sh
+++ b/nixos/modules/installer/tools/nixos-version.sh
@@ -10,7 +10,7 @@ case "$1" in
     ;;
   --json)
     cat <<EOF
-{"nixosVersion": "@version@", "nixpkgsRevision": "@revision@", "configurationRevision": "@configurationRevision@"}
+@json@
 EOF
     ;;
   *)
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 47fa4725288..833865e99bb 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -49,6 +49,13 @@ let
     src = ./nixos-version.sh;
     inherit (config.system.nixos) version codeName revision;
     inherit (config.system) configurationRevision;
+    json = builtins.toJSON ({
+      nixosVersion = config.system.nixos.version;
+    } // optionalAttrs (config.system.nixos.revision != null) {
+      nixpkgsRevision = config.system.nixos.revision;
+    } // optionalAttrs (config.system.configurationRevision != null) {
+      configurationRevision = config.system.configurationRevision;
+    });
   };
 
   nixos-enter = makeProg {