diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-11-16 13:10:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-16 13:10:54 +0100 |
commit | 304e14a198735bfe98d3f2adfc5e2f55841d7c65 (patch) | |
tree | f69b97ba823747e20ff9136105f270753d408251 /nixos | |
parent | 5632aad4739c2fc342ea280cee47b5213f799491 (diff) | |
parent | 2a838cb6d7421a38d008c935aa76650eefb80be0 (diff) | |
download | nixpkgs-304e14a198735bfe98d3f2adfc5e2f55841d7c65.tar nixpkgs-304e14a198735bfe98d3f2adfc5e2f55841d7c65.tar.gz nixpkgs-304e14a198735bfe98d3f2adfc5e2f55841d7c65.tar.bz2 nixpkgs-304e14a198735bfe98d3f2adfc5e2f55841d7c65.tar.lz nixpkgs-304e14a198735bfe98d3f2adfc5e2f55841d7c65.tar.xz nixpkgs-304e14a198735bfe98d3f2adfc5e2f55841d7c65.tar.zst nixpkgs-304e14a198735bfe98d3f2adfc5e2f55841d7c65.zip |
Merge pull request #48588 from zimbatm/shared-codename
group the release info
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/misc/version.nix | 4 |
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 |