NixOS · FRidh · Feb 21, 2019 · Feb 14, 2019 · Feb 14, 2019 · Feb 14, 2019
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
@@ -602,10 +602,9 @@ as the interpreter unless overridden otherwise.
 All parameters from `stdenv.mkDerivation` function are still supported. The following are specific to `buildPythonPackage`:
 
 * `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`.
-* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `buildInputs` when `doCheck = true`.
 * `disabled` ? false: If `true`, package is not build for the particular Python interpreter version.
 * `dontWrapPythonPrograms ? false`: Skip wrapping of python programs.
-* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"].
+* `installFlags ? []`: A list of strings. Arguments to be passed to `pip install`. To pass options to `python setup.py install`, use `--install-option`. E.g., `installFlags=["--install-option='--cpp_implementation'"]`.
 * `format ? "setuptools"`: Format of the source. Valid options are `"setuptools"`, `"flit"`, `"wheel"`, and `"other"`. `"setuptools"` is for when the source has a `setup.py` and `setuptools` is used to build a wheel, `flit`, in case `flit` should be used to build a wheel, and `wheel` in case a wheel is provided. Use `other` when a custom `buildPhase` and/or `installPhase` is needed.
 * `makeWrapperArgs ? []`: A list of strings. Arguments to be passed to `makeWrapper`, which wraps generated binaries. By default, the arguments to `makeWrapper` set `PATH` and `PYTHONPATH` environment variables before calling the binary. Additional arguments here can allow a developer to set environment variables which will be available when the binary is run. For example, `makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]`.
 * `namePrefix`: Prepends text to `${name}` parameter. In case of libraries, this defaults to `"python3.5-"` for Python 3.5, etc., and in case of applications to `""`.
@@ -615,6 +614,14 @@ All parameters from `stdenv.mkDerivation` function are still supported. The foll
 * `removeBinByteCode ? true`: Remove bytecode from `/bin`. Bytecode is only created when the filenames end with `.py`.
 * `setupPyBuildFlags ? []`: List of flags passed to `setup.py build_ext` command.
 
+The `stdenv.mkDerivation` function accepts various parameters for describing build inputs (see "Specifying dependencies"). The following are of special
+interest for Python packages, either because these are primarily used, or because their behaviour is different:
+
+* `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables as well as the items listed in `setup_requires`.
+* `buildInputs ? []`: Build and/or run-time dependencies that need to be be compiled for the host machine. Typically non-Python libraries which are being linked.
+* `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These are added to `nativeBuildInputs` when `doCheck = true`. Items listed in `tests_require` go here.
+* `propagatedBuildInputs ? []`: Aside from propagating dependencies, `buildPythonPackage` also injects code into and wraps executables with the paths included in this list. Items listed in `install_requires` go here.
+
 ##### Overriding Python packages
 
 The `buildPythonPackage` function has a `overridePythonAttrs` method that
@@ -1123,6 +1130,14 @@ LLVM implementation. To use that one instead, Intel recommends users set it with
 Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms;
 moreover, Hydra is not building and distributing pre-compiled binaries using it.
 
+### What inputs do `setup_requires`, `install_requires` and `tests_require` map to?
+
+In a `setup.py` or `setup.cfg` it is common to declare dependencies:
+
+* `setup_requires` corresponds to `nativeBuildInputs`
+* `install_requires` corresponds to `propagatedBuildInputs`
+* `tests_require` corresponds to `checkInputs`
+
 ## Contributing
 
 ### Contributing guidelines

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -151,6 +151,14 @@
      </listitem>
     </itemizedlist>
    </listitem>
+   <listitem>
+    <para>
+      The <varname>buildPythonPackage</varname> now sets <varname>strictDeps = true</varname>
+      to help distinguish between native and non-native dependencies in order to
+      improve cross-compilation compatibility. Note however that this may break
+      user expressions.
+    </para>
+   </listitem>
    <listitem>
     <para>
       The Syncthing state and configuration data has been moved from

diff --git 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 ];
 

diff --git 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

diff --git 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

diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix
@@ -11,7 +11,7 @@ pythonPackages.buildPythonApplication rec {
     rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591";
     sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh";
   };
-  buildInputs = with pythonPackages; [ pytest responses ];
+  checkInputs = with pythonPackages; [ pytest responses ];
   propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ];
 
   disabled = pythonPackages.pythonOlder "3.3";

diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
@@ -4,14 +4,16 @@
 }:
 
 python3Packages.buildPythonApplication rec {
-  name = "electrum-ltc-${version}";
+  pname = "electrum-ltc";
   version = "3.1.3.1";
 
   src = fetchurl {
     url = "https://electrum-ltc.org/download/Electrum-LTC-${version}.tar.gz";
     sha256 = "0kxcx1xf6h9z8x0k483d6ykpnmfr30n6z3r6lgqxvbl42pq75li7";
   };
 
+  nativeBuildInputs = with python3Packages; [ pyqt5 ];
+
   propagatedBuildInputs = with python3Packages; [
     pyaes
     ecdsa

diff --git 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 ];

diff --git 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 = ''

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
@@ -32,28 +32,31 @@ let
     "flask"
     "future"
     "futures"
+    "monotonic"
     "pkginfo"
     "psutil"
     "pyserial"
     "python-dateutil"
     "requests"
     "rsa"
+    "sarge"
     "scandir"
     "semantic_version"
+    "watchdog"
     "websocket-client"
     "werkzeug"
     "wrapt"
   ];
 
 in py.pkgs.buildPythonApplication rec {
   pname = "OctoPrint";
-  version = "1.3.9";
+  version = "1.3.10";
 
   src = fetchFromGitHub {
     owner  = "foosel";
     repo   = "OctoPrint";
     rev    = version;
-    sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4";
+    sha256 = "1pvh7ay76zrvfzcsadh3sl48sgf3by9vpiaqlrkscsw02zirx9r7";
   };
 
   propagatedBuildInputs = with py.pkgs; [
@@ -75,7 +78,9 @@ in py.pkgs.buildPythonApplication rec {
       setup.py
   '';
 
-  checkPhase = "nosetests";
+  checkPhase = ''
+    HOME=$(mktemp -d) nosetests
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://octoprint.org/;

diff --git 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

diff --git 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
   ];
 

diff --git 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
   ];

diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
@@ -1,22 +1,44 @@
 { stdenv, python3, makeDesktopItem }:
 
-python3.pkgs.buildPythonApplication rec {
+let
+
+  spyder-kernels = with python3.pkgs; buildPythonPackage rec {
+    pname = "spyder-kernels";
+    version = "0.4.2";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "a13cefb569ef9f63814cb5fcf3d0db66e09d2d7e6cc68c703d5118b2d7ba062b";
+    };
+
+    propagatedBuildInputs = [
+      cloudpickle
+      ipykernel
+      wurlitzer
+    ];
+
+    # No tests
+    doCheck = false;
+
+    meta = {
+      description = "Jupyter kernels for Spyder's console";
+      homepage = https://github.com/spyder-ide/spyder-kernels;
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
+in python3.pkgs.buildPythonApplication rec {
   pname = "spyder";
-  version = "3.2.8";
+  version = "3.3.3";
 
   src = python3.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5";
+    sha256 = "ef31de03cf6f149077e64ed5736b8797dbd278e3c925e43f0bfc31bb55f6e5ba";
   };
 
-  # Somehow setuptools can't find pyqt5. Maybe because the dist-info folder is missing?
-  postPatch = ''
-    sed -i -e '/pyqt5/d' setup.py
-  '';
-
   propagatedBuildInputs = with python3.pkgs; [
-    jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint
-    numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle
+    jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring
+    numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels
   ];
 
   # There is no test for spyder

diff --git 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  }

diff --git 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

diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -87,6 +87,9 @@ let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attr
   # Propagate python and setuptools. We should stop propagating setuptools.
   propagatedBuildInputs = propagatedBuildInputs ++ [ python setuptools ];
 
+  # Enabled to detect some (native)BuildInputs mistakes
+  strictDeps = true;
+
   # Python packages don't have a checkPhase, only an installCheckPhase
   doCheck = false;
   doInstallCheck = doCheck;

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
@@ -26,11 +26,11 @@ let
 
 in buildPythonPackage rec {
   pname = "Cython";
-  version = "0.29.2";
+  version = "0.29.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2ac187ff998a95abb7fae452b5178f91e1a713698c9ced89836c94e6b1d3f41e";
+    sha256 = "9d5290d749099a8e446422adfb0aa2142c711284800fb1eb70f595101e32cbf1";
   };
 
   nativeBuildInputs = [

diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix
@@ -4,7 +4,7 @@
 , markupsafe
 , nose
 , mock
-, pytest
+, pytest_3
 , isPyPy
 }:
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     sha256 = "4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae";
   };
 
-  checkInputs = [ markupsafe nose mock pytest ];
+  checkInputs = [ markupsafe nose mock pytest_3 ];
   propagatedBuildInputs = [ markupsafe ];
 
   doCheck = !isPyPy;  # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25
@@ -29,4 +29,4 @@ buildPythonPackage rec {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ domenkozar ];
   };
-}
+}
diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "Pygments";
-  version = "2.2.0";
+  version = "2.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1k78qdvir1yb1c634nkv6rbga8wv4289xarghmsbbvzhvr311bnv";
+    sha256 = "5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a";
   };
 
   propagatedBuildInputs = [ docutils ];

diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "Wand";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0rp1zdp2p7qngva5amcw4jb5i8gf569v8469gf6zj36hcnzksxjj";
+    sha256 = "7d6b8dc9d4eaccc430b9c86e6b749013220c994970a3f39e902b397e2fa732c3";
   };
 
   postPatch = ''