Unify the Nixpkgs and NixOS version numbers

2013-10-10 13:28:22 +02:00
parent 3293421dd3
commit 041da5a6f9
8 changed files with 16 additions and 24 deletions
@@ -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