summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2018-11-15 21:51:29 +0100
committerzimbatm <zimbatm@zimbatm.com>2018-11-15 21:56:17 +0100
commit2a838cb6d7421a38d008c935aa76650eefb80be0 (patch)
treea72e574e0596adcb76da4505b8a3f620d51c0cce /nixos
parentf482ff9deb5a7da584ac3888d678d1ff9bd46598 (diff)
downloadnixpkgs-2a838cb6d7421a38d008c935aa76650eefb80be0.tar
nixpkgs-2a838cb6d7421a38d008c935aa76650eefb80be0.tar.gz
nixpkgs-2a838cb6d7421a38d008c935aa76650eefb80be0.tar.bz2
nixpkgs-2a838cb6d7421a38d008c935aa76650eefb80be0.tar.lz
nixpkgs-2a838cb6d7421a38d008c935aa76650eefb80be0.tar.xz
nixpkgs-2a838cb6d7421a38d008c935aa76650eefb80be0.tar.zst
nixpkgs-2a838cb6d7421a38d008c935aa76650eefb80be0.zip
group the release info
this makes the codename globally accessible in the repo. The release is
not only for NixOS anymore.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/misc/version.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index 6d78b7c593f..fd77f637272 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -43,6 +43,7 @@ in
     nixos.codeName = mkOption {
       readOnly = true;
       type = types.str;
+      default = lib.trivial.codeName;
       description = "The NixOS release code name (e.g. <literal>Emu</literal>).";
     };
 
@@ -79,9 +80,6 @@ in
       version = mkDefault (cfg.release + cfg.versionSuffix);
       revision      = mkIf (pathIsDirectory gitRepo) (mkDefault            gitCommitId);
       versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
-
-      # Note: the first letter is bumped on every release.  It's an animal.
-      codeName = "Koi";
     };
 
     # Generate /etc/os-release.  See