Unify the Nixpkgs and NixOS version numbers

nixos/.version

@@ -1 +0,0 @@
-13.09

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

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";

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" ];