diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-10-16 20:25:44 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-10-16 20:25:44 +0200 |
| commit | b6bac6c144d83d364a5d0ab0bef7d6ffa9efc55b (patch) | |
| tree | d8ea414a00c575e6994d7dde170d35480e0df9e8 /nixos/modules/misc/version.nix | |
| parent | 887bf77621dbd93c3e5296a6b047d00bf3da8b78 (diff) | |
| download | nixpkgs-b6bac6c144d83d364a5d0ab0bef7d6ffa9efc55b.tar nixpkgs-b6bac6c144d83d364a5d0ab0bef7d6ffa9efc55b.tar.gz nixpkgs-b6bac6c144d83d364a5d0ab0bef7d6ffa9efc55b.tar.bz2 nixpkgs-b6bac6c144d83d364a5d0ab0bef7d6ffa9efc55b.tar.lz nixpkgs-b6bac6c144d83d364a5d0ab0bef7d6ffa9efc55b.tar.xz nixpkgs-b6bac6c144d83d364a5d0ab0bef7d6ffa9efc55b.tar.zst nixpkgs-b6bac6c144d83d364a5d0ab0bef7d6ffa9efc55b.zip | |
Revert "Merge pull request #48122 from zimbatm/pkg-nixos-rebuild"
This reverts commit 10addad6035034b2b78f3c74ef436cd7146d5231, reversing changes made to 7786575c6c0e1b010d46ad00b14d0bb5bf08d7d2. NixOS scripts should be kept in the NixOS source tree, not in pkgs. Moving them around is just confusing and creates unnecessary code/history churn.
Diffstat (limited to 'nixos/modules/misc/version.nix')
| -rw-r--r-- | nixos/modules/misc/version.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index fd77f637272..6d78b7c593f 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -43,7 +43,6 @@ in nixos.codeName = mkOption { readOnly = true; type = types.str; - default = lib.trivial.codeName; description = "The NixOS release code name (e.g. <literal>Emu</literal>)."; }; @@ -80,6 +79,9 @@ 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 |