Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5632aad4739c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 304e14a19873
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 15, 2018

  1. group the release info 

    this makes the codename globally accessible in the repo. The release is
not only for NixOS anymore.
    @zimbatm
    zimbatm committed Nov 15, 2018
    Copy the full SHA
    2a838cb View commit details

Commits on Nov 16, 2018

  1. Merge pull request #48588 from zimbatm/shared-codename 

    group the release info
    @edolstra
    edolstra authored Nov 16, 2018
    Copy the full SHA
    304e14a View commit details
Showing with 8 additions and 3 deletions.
  1. +7 −0 lib/trivial.nix
  2. +1 −3 nixos/modules/misc/version.nix
7 changes: 7 additions & 0 deletions lib/trivial.nix
View file
Original file line number Diff line number Diff line change
@@ -129,6 +129,13 @@ rec {
/* Returns the current nixpkgs release number as string. */
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. */
versionSuffix =
let suffixFile = ../.version-suffix;
4 changes: 1 addition & 3 deletions nixos/modules/misc/version.nix
View file
Original file line number Diff line number Diff line change
@@ -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