Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed'

2 files changed, 7 insertions, 4 deletions

diff --git a/nixpkgs/pkgs/tools/package-management/nix-review/default.nix b/nixpkgs/pkgs/tools/package-management/nix-review/default.nix
index 367405f552fb..43e261b106bf 100644
--- a/nixpkgs/pkgs/tools/package-management/nix-review/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix-review/default.nix
@@ -8,13 +8,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nix-review";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "nix-review";
     rev = version;
-    sha256 = "1hichipf02yz9n2n1fnky5rm9wxwcd04xlr0y05y78ixw8xb5ah0";
+    sha256 = "19x0wbb8annmzi67r79112j9kjzz99n3qd6adh80iqx2dh47pk5g";
   };
 
   makeWrapperArgs = [
diff --git a/nixpkgs/pkgs/tools/package-management/nix/default.nix b/nixpkgs/pkgs/tools/package-management/nix/default.nix
index 7590a37a8e36..6d0e07d60f98 100644
--- a/nixpkgs/pkgs/tools/package-management/nix/default.nix
+++ b/nixpkgs/pkgs/tools/package-management/nix/default.nix
@@ -3,6 +3,7 @@
 , stateDir ? "/nix/var"
 , confDir ? "/etc"
 , boehmgc
+, stdenv, llvmPackages_6
 }:
 
 let
@@ -166,7 +167,7 @@ in rec {
     inherit storeDir stateDir confDir boehmgc;
   };
 
-  nixStable = callPackage common rec {
+  nixStable = callPackage common (rec {
     name = "nix-2.2.2";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
@@ -174,7 +175,9 @@ in rec {
     };
 
     inherit storeDir stateDir confDir boehmgc;
-  };
+  } // stdenv.lib.optionalAttrs stdenv.cc.isClang {
+    stdenv = llvmPackages_6.stdenv;
+  });
 
   nixUnstable = lib.lowPrio (callPackage common rec {
     name = "nix-2.3${suffix}";