diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2018-02-19 14:45:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 14:45:17 +0000 |
| commit | 1e23a5a6e916ad5992916d7517af7b4fa928c812 (patch) | |
| tree | 0ed9f2bd14b1f8a1465813b64743cf2190f00fef /nixos/modules/services | |
| parent | 43522dc85187b9941aa13ede6d271cf1cb70e28a (diff) | |
| parent | c6d8a58e8d3a9751197e8f731e823c08f5ee5dc3 (diff) | |
| download | nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.tar nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.tar.gz nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.tar.bz2 nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.tar.lz nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.tar.xz nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.tar.zst nixlib-1e23a5a6e916ad5992916d7517af7b4fa928c812.zip | |
Merge pull request #34795 from oxij/os/nixosLabel-pt2
nixos: labels part 2
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/misc/nixos-manual.nix | 6 | ||||
| -rw-r--r-- | nixos/modules/services/misc/ssm-agent.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/ttys/agetty.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 41cadb4a6de0..5d0f2abd13a9 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -16,10 +16,10 @@ let It isn't perfect, but it seems to cover a vast majority of use cases. Caveat: even if the package is reached by a different means, the path above will be shown and not e.g. `${config.services.foo.package}`. */ - manual = import ../../../doc/manual { + manual = import ../../../doc/manual rec { inherit pkgs config; - version = config.system.nixosRelease; - revision = "release-${config.system.nixosRelease}"; + version = config.system.nixos.release; + revision = "release-${version}"; options = let scrubbedEval = evalModules { diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixos/modules/services/misc/ssm-agent.nix index c1e1f0903539..a57fbca86fb6 100644 --- a/nixos/modules/services/misc/ssm-agent.nix +++ b/nixos/modules/services/misc/ssm-agent.nix @@ -12,7 +12,7 @@ let case "$1" in -i) echo "nixos";; - -r) echo "${config.system.nixosVersion}";; + -r) echo "${config.system.nixos.version}";; esac ''; in { diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix index 3429397d2cc2..b50de496e975 100644 --- a/nixos/modules/services/ttys/agetty.nix +++ b/nixos/modules/services/ttys/agetty.nix @@ -64,8 +64,8 @@ in config = { # Note: this is set here rather than up there so that changing - # nixosLabel would not rebuild manual pages - services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixosLabel} (\m) - \l >>>''; + # nixos.label would not rebuild manual pages + services.mingetty.greetingLine = mkDefault ''<<< Welcome to NixOS ${config.system.nixos.label} (\m) - \l >>>''; systemd.services."getty@" = { serviceConfig.ExecStart = [ |