Really fix use of NixOps with the merged Nixpkgs/NixOS tree

Note that there is a subtle difference in Nix that causes
nixos-rebuild to work and NixOps to fail:

$ nix-instantiate '<nixos>' -A config.system.nixosVersion --eval-only
"13.10pre34915.50f4822"

$ nix-instantiate '<nixos/default.nix>' -A config.system.nixosVersion --eval-only
error: opening file `/nix/var/nix/profiles/per-user/root/channels/nixos/.version': No such file or directory

Fixes NixOS/nixops#145.

+3 -2
+3 -2
nixos/modules/misc/version.nix
··· 26 26 config = { 27 27 28 28 system.nixosVersion = 29 - mkDefault (builtins.readFile ../../../.version + config.system.nixosVersionSuffix); 29 + mkDefault (builtins.readFile "${pkgs.path}/.version" + config.system.nixosVersionSuffix); 30 30 31 31 system.nixosVersionSuffix = 32 - mkDefault (if builtins.pathExists ../../../.version-suffix then builtins.readFile ../../../.version-suffix else "pre-git"); 32 + let suffixFile = "${pkgs.path}/.version-suffix"; in 33 + mkDefault (if builtins.pathExists suffixFile then builtins.readFile suffixFile else "pre-git"); 33 34 34 35 # Note: code names must only increase in alphabetical order. 35 36 system.nixosCodeName = "Aardvark";