Merge remote-tracking branch 'upstream/staging' into master

3 files changed, 13 insertions, 13 deletions

diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix
index 69051714ab4c..812053902a57 100644
--- a/pkgs/development/tools/asn2quickder/default.nix
+++ b/pkgs/development/tools/asn2quickder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }:
+{ stdenv, fetchFromGitHub, python2Packages, makeWrapper }:
 
 stdenv.mkDerivation rec {
   pname = "asn2quickder";
@@ -12,15 +12,15 @@ stdenv.mkDerivation rec {
     repo = "${pname}";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ pyparsing makeWrapper ];
+  propagatedBuildInputs = with python2Packages; [ pyparsing makeWrapper ];
 
-  patchPhase = with pythonPackages; ''
+  patchPhase = with python2Packages; ''
     substituteInPlace Makefile \
-      --replace '..' '..:$(DESTDIR)/${python.sitePackages}:${pythonPackages.pyparsing}/${python.sitePackages}' \
+      --replace '..' '..:$(DESTDIR)/${python.sitePackages}:${python2Packages.pyparsing}/${python.sitePackages}' \
     '';
 
   installPhase = ''
-    mkdir -p $out/${pythonPackages.python.sitePackages}/
+    mkdir -p $out/${python2Packages.python.sitePackages}/
     mkdir -p $out/bin $out/lib $out/sbin $out/man
     make DESTDIR=$out PREFIX=/ all
     make DESTDIR=$out PREFIX=/ install
diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix
index a579b45cf626..6fdd250913c9 100644
--- a/pkgs/development/tools/build-managers/gn/default.nix
+++ b/pkgs/development/tools/build-managers/gn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, fetchurl, python, ninja, libevent, xdg-user-dirs }:
+{ stdenv, fetchgit, fetchurl, python2, ninja, libevent, xdg-user-dirs }:
 
 let
   date = "20161008";
@@ -61,11 +61,11 @@ in stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-levent";
 
-  nativeBuildInputs = [ python ninja ];
+  nativeBuildInputs = [ python2 ninja ];
   buildInputs = [ libevent ];
 
   buildPhase = ''
-    python tools/gn/bootstrap/bootstrap.py -v -s --no-clean
+    python2 tools/gn/bootstrap/bootstrap.py -v -s --no-clean
   '';
 
   installPhase = ''
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 75d371b4ec8d..57b4fe99b2f8 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages
+{ stdenv, fetchgit, cmake, llvmPackages, boost, python2Packages
 }:
 
 let
-  inherit (pythonPackages) python;
-in pythonPackages.mkPythonDerivation rec {
+  inherit (python2Packages) python mkPythonDerivation waitress frozendict bottle;
+in mkPythonDerivation rec {
   name = "ycmd-2016-01-12";
   namePrefix = "";
 
@@ -15,7 +15,7 @@ in pythonPackages.mkPythonDerivation rec {
 
   buildInputs = [ cmake boost ];
 
-  propagatedBuildInputs = with pythonPackages; [ waitress frozendict bottle ];
+  propagatedBuildInputs = [ waitress frozendict bottle ];
 
   buildPhase = ''
     export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped}
@@ -24,7 +24,7 @@ in pythonPackages.mkPythonDerivation rec {
 
   configurePhase = ":";
 
-  installPhase = with pythonPackages; ''
+  installPhase = ''
     mkdir -p $out/lib/ycmd/third_party $out/bin
     cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/
     ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd