diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-01 13:45:14 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-10 13:28:22 +0200 |
| commit | 041da5a6f9dfa39b20a8b4f9743e57c15a131d36 (patch) | |
| tree | ef5e0bb8e84f1738e97254c935187ff153f0cbfe /nixos | |
| parent | 3293421dd3434cd84d660f3c4c3c81baf88bbd3d (diff) | |
| download | nixpkgs-041da5a6f9dfa39b20a8b4f9743e57c15a131d36.tar nixpkgs-041da5a6f9dfa39b20a8b4f9743e57c15a131d36.tar.gz nixpkgs-041da5a6f9dfa39b20a8b4f9743e57c15a131d36.tar.bz2 nixpkgs-041da5a6f9dfa39b20a8b4f9743e57c15a131d36.tar.lz nixpkgs-041da5a6f9dfa39b20a8b4f9743e57c15a131d36.tar.xz nixpkgs-041da5a6f9dfa39b20a8b4f9743e57c15a131d36.tar.zst nixpkgs-041da5a6f9dfa39b20a8b4f9743e57c15a131d36.zip | |
Unify the Nixpkgs and NixOS version numbers
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/.version | 1 | ||||
| -rw-r--r-- | nixos/modules/installer/tools/get-version-suffix | 13 | ||||
| -rw-r--r-- | nixos/modules/misc/version.nix | 4 | ||||
| -rw-r--r-- | nixos/release.nix | 4 |
4 files changed, 7 insertions, 15 deletions
diff --git a/nixos/.version b/nixos/.version deleted file mode 100644 index eb28f45ff24..00000000000 --- a/nixos/.version +++ /dev/null @@ -1 +0,0 @@ -13.09 \ No newline at end of file diff --git a/nixos/modules/installer/tools/get-version-suffix b/nixos/modules/installer/tools/get-version-suffix index 76cec8d5dae..461fbf4d3d8 100644 --- a/nixos/modules/installer/tools/get-version-suffix +++ b/nixos/modules/installer/tools/get-version-suffix @@ -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 diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 20a03b44a2a..fa7baf36fb9 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -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"; diff --git a/nixos/release.nix b/nixos/release.nix index 06fb43bf6d6..458e17aef46 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -5,8 +5,8 @@ let - version = builtins.readFile ./.version; - versionSuffix = "pre${toString nixosSrc.revCount}_${nixosSrc.shortRev}-${nixpkgs.shortRev}"; + version = builtins.readFile ../.version; + versionSuffix = "pre${toString nixpkgs.revCount}_${nixpkgs.shortRev}"; systems = [ "x86_64-linux" "i686-linux" ]; |