movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 11:45:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Unify the Nixpkgs and NixOS version numbers

Browse source
This commit is contained in:
Eelco Dolstra 2013-10-01 13:45:14 +02:00
parent 3293421dd3
commit 041da5a6f9
8 changed files with 16 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nixos/modules/installer/tools/get-version-suffix
View file

@ -14,16 +14,9 @@ getVersion() {
fi
}
if nixos=$(nix-instantiate --find-file nixos "$@"); then
getVersion $nixos
if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then
getVersion $nixpkgs
if [ -n "$rev" ]; then
suffix="pre-$rev"
if nixpkgs=$(nix-instantiate --find-file nixpkgs "$@"); then
getVersion $nixpkgs
if [ -n "$rev" ]; then
suffix+="-$rev"
fi
fi
echo $suffix
echo "pre-$rev"
fi
fi

4
nixos/modules/misc/version.nix
View file

@ -26,10 +26,10 @@ with pkgs.lib;
config = {
system.nixosVersion =
mkDefault (builtins.readFile ../../.version + config.system.nixosVersionSuffix);
mkDefault (builtins.readFile ../../../.version + config.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";