diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 785d43973473..bbcf290a7956 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -253,7 +253,7 @@ in
 
   config = {
 
-    nix.chrootDirs = [ "/dev" "/dev/pts" "/proc" "/bin" ];
+    nix.chrootDirs = [ "/bin" ];
 
     environment.etc."nix/nix.conf".source = nixConf;
 
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b02d80078aae..16a276273cc3 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -5,15 +5,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.6.1";
+  name = "nix-1.7";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-    sha256 = "31d15f99b2405924a4be278334cc973a71999303631e6798c1d294db9be4bf84";
+    sha256 = "349163654f2ae3e1a17fb3da7ed164a4cac153728bbe9a26764e17556d3dcc92";
   };
 
-  patches = [ ./hash-check.patch ];
-
   nativeBuildInputs = [ perl pkgconfig ];
 
   buildInputs = [ curl openssl boehmgc sqlite ];
diff --git a/pkgs/tools/package-management/nix/hash-check.patch b/pkgs/tools/package-management/nix/hash-check.patch
deleted file mode 100644
index 421ebb70a4f8..000000000000
--- a/pkgs/tools/package-management/nix/hash-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-commit 11cb4bfb257f18c906ef1d6f14ed450be8fa49fe upstream
-
-diff --git a/src/libstore/build.cc b/src/libstore/build.cc
-index dcd7343..4329d9a 100644
---- a/src/libstore/build.cc
-+++ b/src/libstore/build.cc
-@@ -2749,6 +2749,7 @@ void SubstitutionGoal::finished()
-     logPipe.readSide.close();
- 
-     /* Get the hash info from stdout. */
-+    string dummy = readLine(outPipe.readSide);
-     string expectedHashStr = statusOk(status) ? readLine(outPipe.readSide) : "";
-     outPipe.readSide.close();
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fe3d87190a6..0d2caf45b108 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10510,10 +10510,13 @@ let
     stateDir = config.nix.stateDir or "/nix/var";
   };
 
+  nixUnstable = nixStable;
+  /*
   nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
     storeDir = config.nix.storeDir or "/nix/store";
     stateDir = config.nix.stateDir or "/nix/var";
   };
+  */
 
   nixops = callPackage ../tools/package-management/nixops { };