public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump the NixOS version number to 13.07

Browse Source 
This is in preparation of making a stable release/branch.  The version
number is <YY>.<MM>, Ubuntu style, denoting the intended release
year/month.  It also has a release codename ("Aardvark").
This commit is contained in:
Eelco Dolstra 2013-07-17 13:34:40 +02:00
parent 6620a0f679
commit a6aba08d35
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.version
View File

@ -1 +1 @@
0.2 13.07

2
modules/installer/tools/nixos-version.sh
View File

@ -1,2 +1,2 @@
#! @shell@ #! @shell@
echo @nixosVersion@ echo "@nixosVersion@ (@nixosCodeName@)"

2
modules/installer/tools/tools.nix
View File

@ -55,7 +55,7 @@ let
nixosVersion = makeProg { nixosVersion = makeProg {
name = "nixos-version"; name = "nixos-version";
src = ./nixos-version.sh; src = ./nixos-version.sh;
inherit (config.system) nixosVersion; inherit (config.system) nixosVersion nixosCodeName;
}; };
nixosGui = pkgs.xulrunnerWrapper { nixosGui = pkgs.xulrunnerWrapper {

12
modules/misc/version.nix
View File

@ -16,6 +16,11 @@ with pkgs.lib;
description = "NixOS version suffix."; description = "NixOS version suffix.";
}; };
system.nixosCodeName = mkOption {
type = types.uniq types.string;
description = "NixOS release code name.";
};
}; };
config = { config = {
@ -26,6 +31,9 @@ with pkgs.lib;
system.nixosVersionSuffix = system.nixosVersionSuffix =
mkDefault (if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-git"); mkDefault (if builtins.pathExists ../../.version-suffix then builtins.readFile ../../.version-suffix else "pre-git");
# Note: code names must only increase in alphabetical order.
system.nixosCodeName = "Aardvark";
# Generate /etc/os-release. See # Generate /etc/os-release. See
# http://0pointer.de/public/systemd-man/os-release.html for the # http://0pointer.de/public/systemd-man/os-release.html for the
# format. # format.
@ -34,9 +42,9 @@ with pkgs.lib;
'' ''
NAME=NixOS NAME=NixOS
ID=nixos ID=nixos
VERSION="${config.system.nixosVersion}" VERSION="${config.system.nixosVersion} (${config.system.nixosCodeName})"
VERSION_ID="${config.system.nixosVersion}" VERSION_ID="${config.system.nixosVersion}"
PRETTY_NAME="NixOS ${config.system.nixosVersion}" PRETTY_NAME="NixOS ${config.system.nixosVersion} (${config.system.nixosCodeName})"
HOME_URL="http://nixos.org/" HOME_URL="http://nixos.org/"
''; '';
target = "os-release"; target = "os-release";