Python: fix outfall after setting strictDeps = true;

2019-02-15 10:08:27 +01:00 · 2019-02-15 10:08:27 +01:00 · d2c3fd5af0
commit d2c3fd5af0
parent 7397fa2a27
32 changed files with 58 additions and 40 deletions
--- a/pkgs/applications/audio/gtklick/default.nix
+++ b/pkgs/applications/audio/gtklick/default.nix
@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec {
    pyGtkGlade
  ];

-  buildInputs = [ gettext ];
+  nativeBuildInputs = [ gettext ];

  propagatedBuildInputs = [ klick ];

--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec  {
  ];

  buildInputs = with gst_all_1; [
+    gobject-introspection
    gst-libav
    gst-plugins-bad
    gst-plugins-base
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@ -13,7 +13,7 @@ in pythonPackages.buildPythonApplication rec {
    sha256 = "1p2bvfzby0nk1vh04yfmsvjcldgkj6m6s1hcv9v13hc8q1cbdfk5";
  };

-  buildInputs = [ gettext ];
+  nativeBuildInputs = [ gettext ];

  propagatedBuildInputs = with pythonPackages; [
    pyqt5
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@ -4,7 +4,7 @@
 }:

 python3Packages.buildPythonApplication rec {
-  name = "electrum-ltc-${version}";
+  pname = "electrum-ltc";
  version = "3.1.3.1";

  src = fetchurl {
@ -12,6 +12,8 @@ python3Packages.buildPythonApplication rec {
    sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7";
  };

+  nativeBuildInputs = with python3Packages; [ pyqt5 ];
+
  propagatedBuildInputs = with python3Packages; [
    pyaes
    ecdsa
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@ -18,9 +18,9 @@ pythonPackages.buildPythonApplication rec {
    sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g";
  };

-  nativeBuildInputs = [ wafHook ];
+  nativeBuildInputs = [ wafHook intltool ];
  buildInputs = [
-    docbook2x libxslt gnome-doc-utils intltool dbus-glib hicolor-icon-theme
+    docbook2x libxslt gnome-doc-utils dbus-glib hicolor-icon-theme
  ];

  propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python ];
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@ -7,8 +7,8 @@

 with python3Packages;
 buildPythonApplication rec {
+  pname = "kitty";
  version = "0.13.3";
-  name = "kitty-${version}";
  format = "other";

  src = fetchFromGitHub {
@ -24,7 +24,7 @@ buildPythonApplication rec {
    wayland-protocols wayland dbus
  ];

-  nativeBuildInputs = [ pkgconfig which sphinx ];
+  nativeBuildInputs = [ pkgconfig which sphinx ncurses ];

  outputs = [ "out" "terminfo" ];

@ -36,7 +36,7 @@ buildPythonApplication rec {
  ];

  buildPhase = ''
-    python3 setup.py linux-package
+    ${python.interpreter} setup.py linux-package
  '';

  installPhase = ''
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {

  buildInputs = with gst_all_1; [
    glib-networking
+    gobject-introspection
    gst-libav
    gst-plugins-base
    gst-plugins-ugly
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@ -18,13 +18,14 @@ in pythonPackages.buildPythonApplication rec {
  };

  buildInputs = [
-    gettext gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
+    gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
    gst_all_1.gst-plugins-bad
    gnome3.adwaita-icon-theme
  ] ++ stdenv.lib.optional withGnomeKeyring libgnome-keyring3;

  nativeBuildInputs = [
+    gettext
    wrapGAppsHook
  ];

--- a/pkgs/applications/office/paperwork/default.nix
+++ b/pkgs/applications/office/paperwork/default.nix
@ -6,7 +6,7 @@

 python3Packages.buildPythonApplication rec {
  inherit (python3Packages.paperwork-backend) version src;
-  name = "paperwork-${version}";
+  pname = "paperwork";

  sourceRoot = "source/paperwork-gtk";

@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec {
    paths = lib.collect lib.isDerivation aspellDicts;
  }}/lib/aspell";

-  checkInputs = [ xvfb_run dbus.daemon ];
+  checkInputs = [ xvfb_run dbus.daemon ] ++ (with python3Packages; [ paperwork-backend ]);
  buildInputs = [
    gnome3.adwaita-icon-theme hicolor-icon-theme libnotify librsvg
  ];
--- a/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-big-picture/default.nix
@ -15,6 +15,8 @@ python2Packages.buildPythonApplication rec {

  buildInputs = [ git graphviz ];

+  checkInputs = [ git ];
+
  postFixup = ''
    wrapProgram $out/bin/git-big-picture \
      --prefix PATH ":" ${ stdenv.lib.makeBinPath buildInputs  }
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {

  nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
  buildInputs = with gst_all_1; [
-    gtk3 glib libmediaart gnome-online-accounts
+    gtk3 glib libmediaart gnome-online-accounts gobject-introspection
    gdk_pixbuf gnome3.adwaita-icon-theme python3
    grilo grilo-plugins libnotify libdazzle libsoup
    gnome3.gsettings-desktop-schemas tracker
--- a/pkgs/development/python-modules/editorconfig/default.nix
+++ b/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
--- a/pkgs/development/python-modules/gssapi/default.nix
+++ b/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; {
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/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"}"
--- a/pkgs/development/python-modules/iso3166/default.nix
+++ b/pkgs/development/python-modules/iso3166/default.nix
@ -12,7 +12,7 @@ buildPythonPackage rec {
    sha256 = "0zs9za9dr2nl5srxir08yibmp6nffcapmzala0fgh8ny7y6rafrx";
  };

-  buildInputs = [ pytest ];
+  checkInputs = [ pytest ];

  checkPhase = ''
    py.test
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@ -11,7 +11,7 @@ buildPythonPackage rec {
    sha256 = "05iamhbsqm8binqhc2zchfqdkajlx2icf8xl5vkd5fbrhw6yylad";
  };

-  buildInputs = [ pytest ];
+  checkInputs = [ pytest ];
  propagatedBuildInputs = [ libsodium ];

  postPatch =
--- a/pkgs/development/python-modules/libsexy/default.nix
+++ b/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 = {
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/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 =
--- a/pkgs/development/python-modules/mysql_python/default.nix
+++ b/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;
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/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 = ''
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/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;

--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@ -20,6 +20,7 @@ buildPythonPackage rec {
  };

  buildInputs = [ curl openssl.out ];
+  nativeBuildInputs = [ curl ];

  checkInputs = [ bottle pytest nose flaky ];

--- a/pkgs/development/python-modules/pyside/default.nix
+++ b/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;
  };
 }
--- a/pkgs/development/python-modules/pyside/shiboken.nix
+++ b/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."
--- a/pkgs/development/python-modules/pytest-fixture-config/default.nix
+++ b/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;

--- a/pkgs/development/python-modules/pytest-flakes/default.nix
+++ b/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
--- a/pkgs/development/python-modules/pytest-shutil/default.nix
+++ b/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
--- a/pkgs/development/python-modules/pytest-virtualenv/default.nix
+++ b/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;
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@ -70,7 +70,7 @@ in buildPythonApplication rec {
  checkInputs = [ mock ];

  checkPhase = ''
-    PYTHONPATH=".:$PYTHONPATH" trial tests
+    PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial tests
  '';

  meta = with stdenv.lib; {
--- a/pkgs/tools/backup/ddar/default.nix
+++ b/pkgs/tools/backup/ddar/default.nix
@ -23,6 +23,7 @@ python2.pkgs.buildPythonApplication rec {
    make -f Makefile.prep synctus/ddar_pb2.py
  '';

+  nativeBuildInputs = with python2.pkgs; [ protobuf.protobuf ];
  propagatedBuildInputs = with python2.pkgs; [ protobuf ];

  checkInputs = [ roundup ];
--- a/pkgs/tools/networking/linkchecker/default.nix
+++ b/pkgs/tools/networking/linkchecker/default.nix
@ -18,6 +18,7 @@ python2Packages.buildPythonApplication rec {
  pname = "LinkChecker";
  version = "9.3.1";

+  nativeBuildInputs = [ gettext ];
  propagatedBuildInputs = (with python2Packages; [ 
    requests
  ]) ++ [ gettext ];
--- a/pkgs/tools/security/onioncircuits/default.nix
+++ b/pkgs/tools/security/onioncircuits/default.nix
@ -10,6 +10,7 @@ pythonPackages.buildPythonApplication rec {
    sha256 = "13mqif9b9iajpkrl9ijspdnvy82kxhprxd5mw3njk68rcn4z2pcm";
  };

+  nativeBuildInputs = [ intltool ];
  buildInputs = [ intltool gtk3 gobject-introspection ];
  propagatedBuildInputs =  with pythonPackages; [ stem distutils_extra pygobject3 ];