diff options
| author | makefu <github@syntax-fehler.de> | 2018-04-04 15:23:44 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2018-04-04 15:23:44 +0200 |
| commit | 3ed84b0b8c063a294e7cb40a786fa7a15ee0e5a4 (patch) | |
| tree | 569658ceb8fc90f640d7ce48357eb84a0383b494 /krebs/3modules/os-release.nix | |
| parent | 1b740bf9ef32972f7242226699a75b39feeb18b2 (diff) | |
| parent | 1a5b58c828409ce9bf1639f3f26ebeb142e0148a (diff) | |
Merge remote-tracking branch 'lass/staging/18.03' into staging
Diffstat (limited to 'krebs/3modules/os-release.nix')
| -rw-r--r-- | krebs/3modules/os-release.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/krebs/3modules/os-release.nix b/krebs/3modules/os-release.nix index 8f71a357f..5fbfe6614 100644 --- a/krebs/3modules/os-release.nix +++ b/krebs/3modules/os-release.nix @@ -1,8 +1,11 @@ { config, ... }: with import <stockholm/lib>; let - nixos-version-id = "${config.system.nixosVersion}"; - nixos-version = "${nixos-version-id} (${config.system.nixosCodeName})"; + nixos-version-id = if (hasAttr "nixos" config.system) then + "${config.system.nixos.version}" else "${config.system.nixosVersion}"; + nixos-codeName = if (hasAttr "nixos" config.system) then + "${config.system.nixos.codeName}" else "${config.system.nixosCodeName}"; + nixos-version = "${nixos-version-id} (${nixos-codeName})"; nixos-pretty-name = "NixOS ${nixos-version}"; stockholm-version-id = let |