buildPythonPackage: always export LANG=C.UTF-8

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
@@ -874,7 +881,6 @@ example of such a situation is when `py.test` is used.
     '';
   }
   ```
-- Unicode issues can typically be fixed by including `glibcLocales` in `buildInputs` and exporting `LC_ALL=en_US.utf-8`.
 - Tests that attempt to access `$HOME` can be fixed by using the following work-around before running tests (e.g. `preCheck`): `export HOME=$(mktemp -d)`
 
 ## FAQ
@@ -1123,6 +1129,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

nixos/doc/manual/release-notes/rl-1903.xml

@@ -144,6 +144,20 @@
      </listitem>
     </itemizedlist>
    </listitem>
+   <listitem>
+    <para>
+      The <varname>buildPythonPackage</varname> function 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 <varname>buildPythonPackage</varname> function now sets <varname>LANG = C.UTF-8</varname>
+      to enable Unicode support. The <varname>glibcLocales</varname> package is no longer needed as a build input.
+    </para>
+   </listitem>
    <listitem>
     <para>
       The Syncthing state and configuration data has been moved from

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";

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

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

pkgs/development/interpreters/python/mk-python-derivation.nix

@@ -87,6 +87,11 @@ 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;
+
+  LANG = "C.UTF-8";
+
   # Python packages don't have a checkPhase, only an installCheckPhase
   doCheck = false;
   doInstallCheck = doCheck;

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

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun, glibcLocales }:
+{ lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun }:
 
 buildPythonPackage rec {
   pname = "Babel";
@@ -11,10 +11,9 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pytz ];
 
-  checkInputs = [ pytest freezegun glibcLocales ];
+  checkInputs = [ pytest freezegun  ];
 
   preCheck = ''
-    export LC_ALL="en_US.UTF-8"
   '';
 
   meta = with lib; {

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

@@ -3,7 +3,7 @@
 , buildPythonPackage
 , fetchPypi
 , python
-, glibcLocales
+
 , pkgconfig
 , gdb
 , numpy
@@ -39,8 +39,7 @@ in buildPythonPackage rec {
   checkInputs = [
     numpy ncurses
   ];
-  buildInputs = [ glibcLocales gdb ];
-  LC_ALL = "en_US.UTF-8";
+  buildInputs = [  gdb ];
 
   checkPhase = ''
     export HOME="$NIX_BUILD_TOP"

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 ];
   };
-}
+}

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

@@ -4,7 +4,7 @@
 , fetchPypi
 , fetchpatch
 , doit
-, glibcLocales
+
 , pytest
 , pytestcov
 , mock
@@ -42,7 +42,7 @@ buildPythonPackage rec {
   # other hand doesn't support Python 3.3). So, just disable Python 2.
   disabled = !isPy3k;
 
-  checkInputs = [ pytest pytestcov mock glibcLocales freezegun ];
+  checkInputs = [ pytest pytestcov mock  freezegun ];
 
   propagatedBuildInputs = [
     pygments pillow dateutil docutils Mako unidecode lxml Yapsy PyRSS2Gen
@@ -61,7 +61,6 @@ buildPythonPackage rec {
   };
 
   checkPhase = ''
-    LANG="en_US.UTF-8" LC_ALL="en_US.UTF-8" py.test .
   '';
 
   meta = {

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

@@ -1,7 +1,7 @@
 { lib, buildPythonPackage, fetchPypi, isPy3k
 , pbr, six, simplegeneric, netaddr, pytz, webob
 , cornice, nose, webtest, pecan, transaction, cherrypy, sphinx
-, flask, flask-restful, suds-jurko, glibcLocales }:
+, flask, flask-restful, suds-jurko }:
 
 buildPythonPackage rec {
   pname = "WSME";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     cornice nose webtest pecan transaction cherrypy sphinx
-    flask flask-restful suds-jurko glibcLocales
+    flask flask-restful suds-jurko 
   ];
 
   meta = with lib; {

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

@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, python, isPy3k, glibcLocales }:
+{ stdenv, fetchPypi, buildPythonPackage, python, isPy3k }:
 
 buildPythonPackage rec {
   pname = "aenum";
@@ -11,11 +11,10 @@ buildPythonPackage rec {
 
   # For Python 3, locale has to be set to en_US.UTF-8 for
   # tests to pass
-  checkInputs = if isPy3k then [ glibcLocales ] else [];
+  checkInputs = if isPy3k then [  ] else [];
 
   checkPhase = ''
   runHook preCheck
-  ${if isPy3k then "export LC_ALL=en_US.UTF-8" else ""}
   PYTHONPATH=`pwd` ${python.interpreter} aenum/test.py
   runHook postCheck
   '';

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

@@ -1,7 +1,7 @@
 { lib, fetchFromGitHub, buildPythonPackage, isPy3k
 , six, pytimeparse, parsedatetime, Babel
 , isodate, python-slugify, leather
-, glibcLocales, nose, lxml, cssselect, unittest2 }:
+, nose, lxml, cssselect, unittest2 }:
 
 buildPythonPackage rec {
   pname = "agate";
@@ -21,11 +21,10 @@ buildPythonPackage rec {
     isodate python-slugify leather
   ];
 
-  checkInputs = [ glibcLocales nose lxml cssselect ]
+  checkInputs = [  nose lxml cssselect ]
     ++ lib.optional (!isPy3k) unittest2;
 
   checkPhase = ''
-    LC_ALL="en_US.UTF-8" nosetests tests
   '';
 
   meta = with lib; {

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

@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, isPy33, isPy27, isPyPy, python, pycares, asyncio, trollius }:
+, isPy33, isPy27, isPyPy, python, pycares, typing, asyncio, trollius }:
 
 buildPythonPackage rec {
   pname = "aiodns";
@@ -10,8 +10,7 @@ buildPythonPackage rec {
     sha256 = "d67e14b32176bcf3ff79b5d47c466011ce4adeadfa264f7949da1377332a0449";
   };
 
-  propagatedBuildInputs = with stdenv.lib; [ pycares ]
-    ++ optional isPy33 asyncio
+  propagatedBuildInputs = with stdenv.lib; [ pycares typing ]
     ++ optional (isPy27 || isPyPy) trollius;
 
   checkPhase = ''

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

@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi, fetchpatch
-, pytest, jinja2, sphinx, vega_datasets, ipython, glibcLocales
+, pytest, jinja2, sphinx, vega_datasets, ipython
 , entrypoints, jsonschema, numpy, pandas, six, toolz, typing
 , pythonOlder, recommonmark }:
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     sha256 = "9f4bc7cd132c0005deb6b36c7041ee213a69bbdfcd8c0b1a9f1ae8c1fba733f6";
   };
 
-  checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales recommonmark ];
+  checkInputs = [ pytest jinja2 sphinx vega_datasets ipython  recommonmark ];
 
   propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz ]
     ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ];
@@ -24,7 +24,6 @@ buildPythonPackage rec {
   '';
 
   checkPhase = ''
-    export LANG=en_US.UTF-8
     py.test altair --doctest-modules
   '';
 

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

@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, pytest, setuptools_scm }:
+, pytest_3, setuptools_scm }:
 
 buildPythonPackage rec {
   pname = "apipkg";
@@ -10,8 +10,8 @@ buildPythonPackage rec {
     sha256 = "37228cda29411948b422fae072f57e31d3396d2ee1c9783775980ee9c9990af6";
   };
 
-  buildInputs = [ setuptools_scm ];
-  checkInputs = [ pytest ];
+  nativeBuildInputs = [ setuptools_scm ];
+  checkInputs = [ pytest_3 ];
 
   checkPhase = ''
     py.test

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

@@ -4,7 +4,7 @@
 , pytest
 , py
 , mock
-, glibcLocales
+
 , iocapture
 }:
 
@@ -17,10 +17,9 @@ buildPythonPackage rec {
     sha256 = "e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65";
   };
 
-  checkInputs = [ pytest py mock glibcLocales iocapture ];
+  checkInputs = [ pytest py mock  iocapture ];
 
   checkPhase = ''
-    export LANG="en_US.UTF-8"
     py.test
   '';