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

nixos: rename config.system.nixos* -> config.system.nixos.*

Browse Source
This commit is contained in:
Jan Malakhovski
2018-02-18 12:56:30 +00:00
parent 09512be289
commit 2e6b796761
19 changed files with 92 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/system/activation/top-level.nix
+2 -2
View File
@@ -108,7 +108,7 @@ let
if [] == failed then pkgs.stdenvNoCC.mkDerivation {
name = let hn = config.networking.hostName;
nn = if (hn != "") then hn else "unnamed";
in "nixos-system-${nn}-${config.system.nixosLabel}";
in "nixos-system-${nn}-${config.system.nixos.label}";
preferLocalBuild = true;
allowSubstitutes = false;
buildCommand = systemBuilder;
@@ -122,7 +122,7 @@ let
config.system.build.installBootLoader
or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true";
activationScript = config.system.activationScripts.script;
nixosLabel = config.system.nixosLabel;
nixosLabel = config.system.nixos.label;
configurationName = config.boot.loader.grub.configurationName;