public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos-version --json: Use builtins.toJSON

Browse Source
This commit is contained in:
Eelco Dolstra 2020-02-10 15:25:24 +01:00
parent f9392f04ae
commit b98ea45608
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/installer/tools/nixos-version.sh
View File

@ -10,7 +10,7 @@ case "$1" in
;; ;;
--json) --json)
cat <<EOF cat <<EOF
{"nixosVersion": "@version@", "nixpkgsRevision": "@revision@", "configurationRevision": "@configurationRevision@"} @json@
EOF EOF
;; ;;
*) *)

7
nixos/modules/installer/tools/tools.nix
View File

@ -49,6 +49,13 @@ let
src = ./nixos-version.sh; src = ./nixos-version.sh;
inherit (config.system.nixos) version codeName revision; inherit (config.system.nixos) version codeName revision;
inherit (config.system) configurationRevision; 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 { nixos-enter = makeProg {