group the release info
this makes the codename globally accessible in the repo. The release is not only for NixOS anymore.
This commit is contained in:
parent
f482ff9deb
commit
2a838cb6d7
|
@ -129,6 +129,13 @@ rec {
|
||||||
/* Returns the current nixpkgs release number as string. */
|
/* Returns the current nixpkgs release number as string. */
|
||||||
release = lib.strings.fileContents ../.version;
|
release = lib.strings.fileContents ../.version;
|
||||||
|
|
||||||
|
/* Returns the current nixpkgs release code name.
|
||||||
|
|
||||||
|
On each release the first letter is bumped and a new animal is chosen
|
||||||
|
starting with that new letter.
|
||||||
|
*/
|
||||||
|
codeName = "Koi";
|
||||||
|
|
||||||
/* Returns the current nixpkgs version suffix as string. */
|
/* Returns the current nixpkgs version suffix as string. */
|
||||||
versionSuffix =
|
versionSuffix =
|
||||||
let suffixFile = ../.version-suffix;
|
let suffixFile = ../.version-suffix;
|
||||||
|
|
|
@ -43,6 +43,7 @@ in
|
||||||
nixos.codeName = mkOption {
|
nixos.codeName = mkOption {
|
||||||
readOnly = true;
|
readOnly = true;
|
||||||
type = types.str;
|
type = types.str;
|
||||||
|
default = lib.trivial.codeName;
|
||||||
description = "The NixOS release code name (e.g. <literal>Emu</literal>).";
|
description = "The NixOS release code name (e.g. <literal>Emu</literal>).";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -79,9 +80,6 @@ in
|
||||||
version = mkDefault (cfg.release + cfg.versionSuffix);
|
version = mkDefault (cfg.release + cfg.versionSuffix);
|
||||||
revision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId);
|
revision = mkIf (pathIsDirectory gitRepo) (mkDefault gitCommitId);
|
||||||
versionSuffix = mkIf (pathIsDirectory gitRepo) (mkDefault (".git." + 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
|
# Generate /etc/os-release. See
|
||||||
|
|
Loading…
Reference in a new issue