diff options
| author | jeschli <jeschli@gmail.com> | 2018-04-18 08:19:05 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-04-18 08:19:05 +0200 |
| commit | e800670c1892cca7c9d12476d65bb4750e213890 (patch) | |
| tree | cf20fc27b3fe7e271d7b0441c880283c91f42e60 /krebs/3modules | |
| parent | e3445be6dafe4f16e150549baee34055a6b04fef (diff) | |
| parent | 5b8c4d24e274bbf26e85420fc11b5bf7e24ac22d (diff) | |
Merge branch 'master' of prism.r:stockholm
Diffstat (limited to 'krebs/3modules')
| -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 |