diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-02-10 15:25:24 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-02-10 15:45:10 +0100 |
| commit | b98ea4560899470536506426a74704a907fcfc8f (patch) | |
| tree | f6dca2d7de04591adb73ad4f6c9de83e96e48ca8 /nixos/modules/installer | |
| parent | f9392f04aef1d534e5baa6f136264270f050be5d (diff) | |
| download | nixpkgs-b98ea4560899470536506426a74704a907fcfc8f.tar nixpkgs-b98ea4560899470536506426a74704a907fcfc8f.tar.gz nixpkgs-b98ea4560899470536506426a74704a907fcfc8f.tar.bz2 nixpkgs-b98ea4560899470536506426a74704a907fcfc8f.tar.lz nixpkgs-b98ea4560899470536506426a74704a907fcfc8f.tar.xz nixpkgs-b98ea4560899470536506426a74704a907fcfc8f.tar.zst nixpkgs-b98ea4560899470536506426a74704a907fcfc8f.zip | |
nixos-version --json: Use builtins.toJSON
Diffstat (limited to 'nixos/modules/installer')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-version.sh | 2 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/tools.nix | 7 |
2 files changed, 8 insertions, 1 deletions
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 { |