summary refs log tree commit diff
path: root/nixos/modules/misc
diff options
context:
space:
mode:
authorzimbatm <zimbatm@zimbatm.com>2018-10-11 12:15:25 +0200
committerzimbatm <zimbatm@zimbatm.com>2018-10-16 11:11:28 +0200
commitb7a07313cc72219964b93e47c36fffeed314a351 (patch)
tree9f27850babd0eff1f6484ca06f20151fab3e8474 /nixos/modules/misc
parentd2b5518e1e81f9a053d1491b354daf23f68f7535 (diff)
downloadnixlib-b7a07313cc72219964b93e47c36fffeed314a351.tar
nixlib-b7a07313cc72219964b93e47c36fffeed314a351.tar.gz
nixlib-b7a07313cc72219964b93e47c36fffeed314a351.tar.bz2
nixlib-b7a07313cc72219964b93e47c36fffeed314a351.tar.lz
nixlib-b7a07313cc72219964b93e47c36fffeed314a351.tar.xz
nixlib-b7a07313cc72219964b93e47c36fffeed314a351.tar.zst
nixlib-b7a07313cc72219964b93e47c36fffeed314a351.zip
move the codeName to /.codeName
Make the codeName globally accessible in the repo. The release is not
only for NixOS anymore.
Diffstat (limited to 'nixos/modules/misc')
-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 6d78b7c593f8..fd77f6372720 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