Python: fix outfall after setting strictDeps = true;

pkgs/development/python-modules/editorconfig/default.nix

@@ -15,7 +15,7 @@ buildPythonPackage rec {
     sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
   checkPhase = ''
     cmake .
     # utf_8_char fails with python3

pkgs/development/python-modules/gssapi/default.nix

@@ -1,5 +1,5 @@
-{ stdenv, pkgs, lib, buildPythonPackage, fetchPypi, six, enum34, decorator,
-nose, shouldbe, gss, krb5Full, which, darwin }:
+{ stdenv, lib, buildPythonPackage, fetchPypi, six, enum34, decorator,
+nose, gss, krb5Full, darwin }:
 
 buildPythonPackage rec {
   pname = "gssapi";
@@ -16,13 +16,15 @@ buildPythonPackage rec {
       --replace "get_output('krb5-config gssapi --prefix')" "'${lib.getDev krb5Full}'"
   '';
 
-  LD_LIBRARY_PATH = "${pkgs.krb5Full}/lib";
+  LD_LIBRARY_PATH = "${krb5Full}/lib";
 
-  buildInputs = [ krb5Full which nose shouldbe ]
+  nativeBuildInputs = [ krb5Full ]
   ++ ( if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.GSS ] else [ gss ] );
 
   propagatedBuildInputs =  [ decorator enum34 six ];
 
+  checkInputs = [ nose ];
+
   doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local'
 
   meta = with stdenv.lib; {

pkgs/development/python-modules/gst-python/default.nix

@@ -46,7 +46,7 @@ in buildPythonPackage rec {
     substituteInPlace meson.build --replace python3 python${if isPy3k then "3" else "2"}
   '';
 
-  nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection ];
+  nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection gst-plugins-base ];
 
   mesonFlags = [
     "-Dpython=python${if isPy3k then "3" else "2"}"

pkgs/development/python-modules/iso3166/default.nix

@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx";
   };
 
-  buildInputs = [ pytest ];
+  checkInputs = [ pytest ];
 
   checkPhase = ''
     py.test

pkgs/development/python-modules/libnacl/default.nix

@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "05iamhbsqm8binqhc2zchfqdkajlx2icf8xl5vkd5fbrhw6yylad";
   };
 
-  buildInputs = [ pytest ];
+  checkInputs = [ pytest ];
   propagatedBuildInputs = [ libsodium ];
 
   postPatch =

pkgs/development/python-modules/libsexy/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }:
+{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib, python }:
 
 buildPythonPackage rec {
   pname = "libsexy";
@@ -10,14 +10,14 @@ buildPythonPackage rec {
     sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig pygtk ];
 
   propagatedBuildInputs = [
-    pygtk libsexy gtk2 glib pango libxml2
+    pygtk libsexy glib pango libxml2
   ];
 
   postInstall = ''
-    ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/
+    ln -s $out/${python.sitePackages}/gtk-2.0/* $out/${python.sitePackages}
   '';
 
   meta = {

pkgs/development/python-modules/mpi4py/default.nix

@@ -48,7 +48,7 @@ buildPythonPackage rec {
 
   setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];
 
-  buildInputs = [ mpi openssh ];
+  nativeBuildInputs = [ mpi openssh ];
 
   meta = {
     description =

pkgs/development/python-modules/mysql_python/default.nix

@@ -17,8 +17,9 @@ buildPythonPackage rec {
     sha256 = "0x0c2jg0bb3pp84njaqiic050qkyd7ymwhfvhipnimg58yv40441";
   };
 
-  buildInputs = [ nose ];
-  propagatedBuildInputs = [ pkgs.mysql.connector-c ];
+  checkInputs = [ nose ];
+  nativeBuildInputs = [ pkgs.mysql.connector-c ];
+  buildInputs = [ pkgs.mysql.connector-c ];
 
   # plenty of failing tests
   doCheck = false;

pkgs/development/python-modules/pgspecial/default.nix

@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "0yvlxv9vy0hbfgf0xcwl7wh5hg6cl86arsv1ip3kvn9znn6x8kgl";
   };
 
-  buildInputs = [ pytest psycopg2 ];
+  checkInputs = [ pytest psycopg2 ];
   propagatedBuildInputs = [ click sqlparse ];
 
   checkPhase = ''

pkgs/development/python-modules/psycopg2/default.nix

@@ -12,7 +12,7 @@ buildPythonPackage rec {
   };
 
   buildInputs = lib.optional stdenv.isDarwin openssl;
-  propagatedBuildInputs = [ postgresql ];
+  nativeBuildInputs = [ postgresql ];
 
   doCheck = false;
 

pkgs/development/python-modules/pycurl/default.nix

@@ -20,6 +20,7 @@ buildPythonPackage rec {
   };
 
   buildInputs = [ curl openssl.out ];
+  nativeBuildInputs = [ curl ];
 
   checkInputs = [ bottle pytest nose flaky ];
 

pkgs/development/python-modules/pyside/default.nix

@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
+  nativeBuildInputs = [ cmake pysideGeneratorrunner pysideShiboken qt4 ];
 
   makeFlags = "QT_PLUGIN_PATH=" + pysideShiboken + "/lib/generatorrunner";
 
@@ -22,6 +22,6 @@ buildPythonPackage rec {
     license = lib.licenses.lgpl21;
     homepage = http://www.pyside.org;
     maintainers = [ lib.maintainers.chaoflow ];
-    platforms = lib.platforms.all;
+    broken = true;
   };
 }

pkgs/development/python-modules/pyside/shiboken.nix

@@ -16,7 +16,7 @@ buildPythonPackage rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ];
+  nativeBuildInputs = [ cmake libxml2 libxslt pysideApiextractor pysideGeneratorrunner python sphinx qt4 ];
 
   preConfigure = ''
     echo "preConfigure: Fixing shiboken_generator install target."

pkgs/development/python-modules/pytest-fixture-config/default.nix

@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, setuptools-git, pytest }:
+, setuptools-git, pytest_3 }:
 
 buildPythonPackage rec {
   pname = "pytest-fixture-config";
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools-git ];
 
-  buildInputs = [ pytest ];
+  buildInputs = [ pytest_3 ];
 
   doCheck = false;
 

pkgs/development/python-modules/pytest-flakes/default.nix

@@ -10,7 +10,8 @@ buildPythonPackage rec {
     sha256 = "341964bf5760ebbdde9619f68a17d5632c674c3f6903ef66daa0a4f540b3d143";
   };
 
-  buildInputs = [ pytestpep8 pytest ];
+  checkInputs = [ pytestpep8 pytest ];
+  nativeBuildInputs = [ pytest ];
   propagatedBuildInputs = [ pyflakes ];
 
   # disable one test case that looks broken

pkgs/development/python-modules/pytest-shutil/default.nix

@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, pytest, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet
+, pytest_3, cmdline, pytestcov, coverage, setuptools-git, mock, pathpy, execnet
 , contextlib2, termcolor }:
 
 buildPythonPackage rec {
@@ -11,8 +11,9 @@ buildPythonPackage rec {
     sha256 = "efe615b7709637ec8828abebee7fc2ad033ae0f1fc54145f769a8b5e8cc3b4ca";
   };
 
-  buildInputs = [ cmdline pytest ];
+  checkInputs = [ cmdline pytest_3 ];
   propagatedBuildInputs = [ pytestcov coverage setuptools-git mock pathpy execnet contextlib2 termcolor ];
+  nativeBuildInputs = [ pytest_3 ];
 
   checkPhase = ''
     py.test

pkgs/development/python-modules/pytest-virtualenv/default.nix

@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, pytest, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }:
+, pytest_3, pytestcov, mock, cmdline, pytest-fixture-config, pytest-shutil }:
 
 buildPythonPackage rec {
   pname = "pytest-virtualenv";
@@ -10,10 +10,12 @@ buildPythonPackage rec {
     sha256 = "d281725d10848773cb2b495d1255dd0a42fc9179e34a274c22e1c35837721f19";
   };
 
-  buildInputs = [ pytest pytestcov mock cmdline ];
+  checkInputs = [ pytest_3 pytestcov mock cmdline ];
   propagatedBuildInputs = [ pytest-fixture-config pytest-shutil ];
   checkPhase = '' py.test tests/unit '';
 
+  nativeBuildInputs = [ pytest_3 ];
+
   meta = with stdenv.lib; {
     description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed.";
     homepage = https://github.com/manahl/pytest-plugins;