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/modules/installer/tools/get-version-suffix | |
| 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/modules/installer/tools/get-version-suffix')
| -rw-r--r-- | nixos/modules/installer/tools/get-version-suffix | 13 |
1 files changed, 3 insertions, 10 deletions
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 |