git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #48588 from zimbatm/shared-codename

group the release info

commit304e14a198735bfe98d3f2adfc5e2f55841d7c65 authorEelco Dolstra <edolstra@gmail.com> dateFri 16 Nov 2018, 13:10 (8 years ago) parent5632aad2a838cb
2 files changed+8−3
lib/trivial.nix+7 nixos/modules/misc/version.nix+1−3
lib/trivial.nix+7
@@ -129,6 +129,13 @@ rec {
129129 /* Returns the current nixpkgs release number as string. */
130130 release = lib.strings.fileContents ../.version;
131131
132+ /* Returns the current nixpkgs release code name.
133+
134+ On each release the first letter is bumped and a new animal is chosen
135+ starting with that new letter.
136+ */
137+ codeName = "Koi";
138+
132139 /* Returns the current nixpkgs version suffix as string. */
133140 versionSuffix =
134141 let suffixFile = ../.version-suffix;
nixos/modules/misc/version.nix+1−3
@@ -43,6 +43,7 @@ in
4343 nixos.codeName = mkOption {
4444 readOnly = true;
4545 type = types.str;
46+ default = lib.trivial.codeName;
4647 description = "The NixOS release code name (e.g. <literal>Emu</literal>).";
4748 };
4849
@@ -79,9 +80,6 @@ in
7980 version = mkDefault (cfg.release + cfg.versionSuffix);
8081 revision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId);
8182 versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + gitCommitId));
82−
83− # Note: the first letter is bumped on every release. It's an animal.
84− codeName = "Koi";
8583 };
8684
8785 # Generate /etc/os-release. See