diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2017-04-01 00:00:00 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-02-18 12:56:30 +0000 |
| commit | 2e6b796761672e0e3ed685487007bb0d99126d91 (patch) | |
| tree | 530c7866ba30fa6480e24da2d603bac7b292a0e1 /nixos/modules/installer/tools | |
| parent | 09512be289819507ca53d7f7be5e4b712b78283d (diff) | |
| download | nixlib-2e6b796761672e0e3ed685487007bb0d99126d91.tar nixlib-2e6b796761672e0e3ed685487007bb0d99126d91.tar.gz nixlib-2e6b796761672e0e3ed685487007bb0d99126d91.tar.bz2 nixlib-2e6b796761672e0e3ed685487007bb0d99126d91.tar.lz nixlib-2e6b796761672e0e3ed685487007bb0d99126d91.tar.xz nixlib-2e6b796761672e0e3ed685487007bb0d99126d91.tar.zst nixlib-2e6b796761672e0e3ed685487007bb0d99126d91.zip | |
nixos: rename config.system.nixos* -> config.system.nixos.*
Diffstat (limited to 'nixos/modules/installer/tools')
| -rw-r--r-- | nixos/modules/installer/tools/nixos-generate-config.pl | 2 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/nixos-version.sh | 4 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/tools.nix | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 7c737e84de0a..a82ee63fd0cd 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -625,7 +625,7 @@ $bootLoaderConfig # compatible, in order to avoid breaking some software such as database # servers. You should change this only after NixOS release notes say you # should. - system.stateVersion = "${\(qw(@nixosRelease@))}"; # Did you read the comment? + system.stateVersion = "${\(qw(@release@))}"; # Did you read the comment? } EOF diff --git a/nixos/modules/installer/tools/nixos-version.sh b/nixos/modules/installer/tools/nixos-version.sh index 77a1b458a342..190c49a33ec6 100644 --- a/nixos/modules/installer/tools/nixos-version.sh +++ b/nixos/modules/installer/tools/nixos-version.sh @@ -6,9 +6,9 @@ case "$1" in exit 1 ;; --hash|--revision) - echo "@nixosRevision@" + echo "@revision@" ;; *) - echo "@nixosVersion@ (@nixosCodeName@)" + echo "@version@ (@codeName@)" ;; esac diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index a3bae78c0ffc..eab5f1147667 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -55,7 +55,7 @@ let src = ./nixos-generate-config.pl; path = [ pkgs.btrfs-progs ]; perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; - inherit (config.system) nixosRelease; + inherit (config.system.nixos) release; }; nixos-option = makeProg { @@ -66,7 +66,7 @@ let nixos-version = makeProg { name = "nixos-version"; src = ./nixos-version.sh; - inherit (config.system) nixosVersion nixosCodeName nixosRevision; + inherit (config.system.nixos) version codeName revision; }; in |