Merge staging-next into master

2019-05-07 19:29:06 +02:00
parent 6ae8aed1c2 0196d8f11c
commit a80982b4c9
284 changed files with 1681 additions and 3658 deletions
--- 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.2";
+  version = "0.5.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0nvdq15gmkzhwpwkln8wmkq0h4izznnr6zmrnwqza8lsa1c0jz5f";
+    sha256 = "a2c318993791fab4fcfd460045415176f81d42f8c6fd8a88fb8d74d2f0f34b97";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -13,11 +13,11 @@

 buildPythonPackage rec {
  pname = "ansible-runner";
-  version = "1.3.2";
+  version = "1.3.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "6e4d8256351228c00fe68697e7f5ad2a2e0fd4085084b913eda22735023bb891";
+    sha256 = "2a2b83e63b830de3ff01c2992342cfe09f96e410953c85904ee7e301b21fa513";
  };

  checkInputs = [ pytest mock ];
--- a/pkgs/development/python-modules/asyncssh/default.nix
+++ b/pkgs/development/python-modules/asyncssh/default.nix
@@ -1,18 +1,35 @@
-{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
+{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, fetchpatch
 , cryptography
 , bcrypt, gssapi, libnacl, libsodium, nettle, pyopenssl
-, openssl }:
+, openssl, openssh }:

 buildPythonPackage rec {
  pname = "asyncssh";
-  version = "1.15.1";
+  version = "1.16.1";
  disabled = pythonOlder "3.4";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "f2065a8b3af0c514c8de264e7b01f08df5213b707bacb7e7c080bd46c3e3bc35";
+    sha256 = "0qia1ay2dhwps5sfh0hif7mrv7yxvykxs9l7cmfp4m6hmqnn3r5r";
  };

+  patches = [
+    # Reverts https://github.com/ronf/asyncssh/commit/4b3dec994b3aa821dba4db507030b569c3a32730
+    #
+    # This changed the test to avoid setting the sticky bit
+    # because that's not allowed for plain files in FreeBSD.
+    # However that broke the test on NixOS, failing with
+    # "Operation not permitted"
+    ./fix-sftp-chmod-test-nixos.patch
+
+    # Restore libnacl support for curve25519/ed25519 as a fallback for PyCA
+    # Fixes https://github.com/ronf/asyncssh/issues/206 with older openssl
+    (fetchpatch {
+      url = "https://github.com/ronf/asyncssh/commit/1dee113bb3e4a6888de562b0413e9abd6a0f0f04.patch";
+      sha256 = "04bckdj7i6xk24lizkn3a8cj375pkz7yc57fc0vk222c6jzwzaml";
+    })
+  ];
+
  propagatedBuildInputs = [
    bcrypt
    cryptography
@@ -23,17 +40,20 @@ buildPythonPackage rec {
    pyopenssl
  ];

-  checkInputs = [ openssl ];
+  checkInputs = [
+    openssh
+    openssl
+  ];

  # Disables windows specific test (specifically the GSSAPI wrapper for Windows)
  postPatch = ''
-    rm ./tests/sspi_stub.py
+    rm tests/sspi_stub.py
  '';

  meta = with stdenv.lib; {
    description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework";
-    homepage    = https://pypi.python.org/pypi/asyncssh;
-    license     = licenses.epl20;
+    homepage = https://asyncssh.readthedocs.io/en/latest;
+    license = licenses.epl20;
    maintainers = with maintainers; [ worldofpeace ];
  };
 }
--- a/pkgs/development/python-modules/asyncssh/fix-sftp-chmod-test-nixos.patch
+++ b/pkgs/development/python-modules/asyncssh/fix-sftp-chmod-test-nixos.patch
@@ -0,0 +1,15 @@
+diff --git a/tests/test_sftp.py b/tests/test_sftp.py
+index db9cc88..234004b 100644
+--- a/tests/test_sftp.py
+++ b/tests/test_sftp.py
+@@ -957,8 +957,8 @@ class _TestSFTP(_CheckSFTP):
+ 
+         try:
+             self._create_file('file')
+-            yield from sftp.chmod('file', 0o4321)
+-            self.assertEqual(stat.S_IMODE(os.stat('file').st_mode), 0o4321)
+            yield from sftp.chmod('file', 0o1234)
+            self.assertEqual(stat.S_IMODE(os.stat('file').st_mode), 0o1234)
+         finally:
+             remove('file')
+ 
--- a/pkgs/development/python-modules/atomman/default.nix
+++ b/pkgs/development/python-modules/atomman/default.nix
@@ -13,12 +13,12 @@
 }:

 buildPythonPackage rec {
-  version = "1.2.5";
+  version = "1.2.6";
  pname = "atomman";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "10eca8c6fc890f2ee2e30f65178c618175529e9998be449e276f7c3d1dce0e95";
+    sha256 = "19501bfdf7e66090764a0ccbecf85a128b46333ea232c2137fa4345512b8b502";
  };

  checkInputs = [ pytest ];
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -20,8 +20,6 @@ buildPythonPackage rec {
  # Tests are not included in the PyPI package
  doCheck = false;

-  disabled = isPy3k;
-
  propagatedBuildInputs = [
    boto3
    enum34
--- a/pkgs/development/python-modules/azure-common/default.nix
+++ b/pkgs/development/python-modules/azure-common/default.nix
@@ -7,14 +7,14 @@
 }:

 buildPythonPackage rec {
-  version = "1.1.18";
+  version = "1.1.19";
  pname = "azure-common";
  disabled = isPyPy;

  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    sha256 = "5fd62ae10b1add97d3c69af970328ec3bd869184396bcf6bfa9c7bc94d688424";
+    sha256 = "622d9360a1b61172b4c0d1cc58f939c68402aa19ca44872ab3d224d913aa6d0c";
  };

  propagatedBuildInputs = [ azure-nspkg ];
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -2,11 +2,11 @@

 if isPyPy then null else buildPythonPackage rec {
  pname = "cffi";
-  version = "1.12.2";
+  version = "1.12.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "e113878a446c6228669144ae8a56e268c91b7f1fafae927adc4879d9849e0ea7";
+    sha256 = "041c81822e9f84b1d9c401182e174996f0bae9991f33725d059b771744290774";
  };

  outputs = [ "out" "dev" ];
@@ -31,7 +31,7 @@ if isPyPy then null else buildPythonPackage rec {
  # The tests use -Werror but with python3.6 clang detects some unreachable code.
  NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ];

-  doCheck = !stdenv.hostPlatform.isMusl; # TODO: Investigate
+  doCheck = !stdenv.hostPlatform.isMusl && !stdenv.isDarwin; # TODO: Investigate
  checkPhase = ''
    py.test -k "not test_char_pointer_conversion"
  '';
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pyyaml
+, six
+, requests
+, aws-sam-translator
+, jsonpatch
+, jsonschema
+, pathlib2
+}:
+
+buildPythonPackage rec {
+  pname = "cfn-lint";
+  version = "0.19.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "5a723ff791fc23aced78e9cde28f18f9eeae9a24f91db2b7a20f7aa837a613b3";
+  };
+
+  propagatedBuildInputs = [
+    pyyaml
+    six
+    requests
+    aws-sam-translator
+    jsonpatch
+    jsonschema
+    pathlib2
+  ];
+
+  # No tests included in archive
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Checks cloudformation for practices and behaviour that could potentially be improved";
+    homepage = https://github.com/aws-cloudformation/cfn-python-lint;
+    license = licenses.mit;
+  };
+}
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -53,14 +53,6 @@ buildPythonPackage rec {
    py.test --disable-pytest-warnings tests
  '';

-  # The test assumes that if we're on Sierra or higher, that we use `getentropy`, but for binary
-  # compatibility with pre-Sierra for binary caches, we hide that symbol so the library doesn't
-  # use it. This boils down to them checking compatibility with `getentropy` in two different places,
-  # so let's neuter the second test.
-  postPatch = ''
-    substituteInPlace ./tests/hazmat/backends/test_openssl.py --replace '"16.0"' '"99.0"'
-  '';
-
  # IOKit's dependencies are inconsistent between OSX versions, so this is the best we
  # can do until nix 1.11's release
  __impureHostDeps = [ "/usr/lib" ];
--- a/pkgs/development/python-modules/cx_oracle/default.nix
+++ b/pkgs/development/python-modules/cx_oracle/default.nix
@@ -2,13 +2,13 @@

 buildPythonPackage rec {
  pname = "cx_Oracle";
-  version = "7.1.2";
+  version = "7.1.3";

  buildInputs = [ odpic ];

  src = fetchPypi {
    inherit pname version;
-    sha256 = "7d0e30d6ce62bedd41ae4885d43fff727314b67655ec8737b8af5cc0aad7f925";
+    sha256 = "4f26b7418e2796112f8b36338a2f9a7c07dd08df53d857e3478bb53f61dd52e4";
  };

  preConfigure = ''
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -11,11 +11,11 @@
 buildPythonPackage rec {
  pname = "cypari2";
  # upgrade may break sage, please test the sage build or ping @timokau on upgrade
-  version = "2.1.0";
+  version = "2.1.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0bm5jvmwqp48n6b385mw4v7wsws9zk62mgb7xf5ymiq7k6wgvxli";
+    sha256 = "df1ef62e771ec36e5a456f5fc8b51bc6745b70f0efdd0c7a30c3f0b5f1fb93db";
  };

  # This differs slightly from the default python installPhase in that it pip-installs
--- a/pkgs/development/python-modules/django_silk/default.nix
+++ b/pkgs/development/python-modules/django_silk/default.nix
@@ -16,11 +16,11 @@

 buildPythonPackage rec {
  pname = "django-silk";
-  version = "3.0.1";
+  version = "3.0.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "bce0e35d2a6ec3688a0c062c6964695beef4a452be48085f2c1e25f685652d9d";
+    sha256 = "8dd5b78531360bd8c3d571384f9f4f82ef03e1764e30dd4621c5638f5c973a1d";
  };

  doCheck = false;
--- a/pkgs/development/python-modules/ecdsa/default.nix
+++ b/pkgs/development/python-modules/ecdsa/default.nix
@@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "ecdsa";
-  version = "0.13";
+  version = "0.13.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4";
+    sha256 = "5c034ffa23413ac923541ceb3ac14ec15a0d2530690413bff58c12b80e56d884";
  };

  # Only needed for tests
--- a/pkgs/development/python-modules/genanki/default.nix
+++ b/pkgs/development/python-modules/genanki/default.nix
@@ -4,11 +4,11 @@

 buildPythonPackage rec {
  pname = "genanki";
-  version = "0.6.3";
+  version = "0.6.4";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "2408f7d9955c8963fd9b1ecbb873f5d18dee786e060dcb083aef5dd86c736773";
+    sha256 = "6d17761e06aca2d9acb588acfdce33fd3d05571338825760622c99fc7210f15a";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/gsd/default.nix
+++ b/pkgs/development/python-modules/gsd/default.nix
@@ -5,12 +5,12 @@
 }:

 buildPythonPackage rec {
-  version = "1.6.1";
+  version = "1.6.2";
  pname = "gsd";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "18icw5cbsq4gnhx4vsjwhxzcx11mbnz6kmwgrylkf82m7m1v2921";
+    sha256 = "58a6669f2375936810d74c3ee7e62c5616acf9e15aa32603701e55ab6fada5f5";
  };

  propagatedBuildInputs = [ numpy ];
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "httplib2";
-  version = "0.12.1";
+  version = "0.12.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "4ba6b8fd77d0038769bf3c33c9a96a6f752bc4cdf739701fdcaf210121f399d4";
+    sha256 = "a18121c7c72a56689efbf1aef990139ad940fee1e64c6f2458831736cd593600";
  };

  # Needs setting up
--- a/pkgs/development/python-modules/j2cli/default.nix
+++ b/pkgs/development/python-modules/j2cli/default.nix
@@ -9,12 +9,12 @@

 buildPythonPackage rec {
  pname = "j2cli";
-  version = "0.3.6.post1";
+  version = "0.3.7";
  disabled = isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1j8s09b75w041b2lawjz341ri997n9fnxbd2ipm9czxj6fhj8hi2";
+    sha256 = "a7b0bdb02a3afb6d2eff40228b2216306332ace4341372310dafd15f938e1afa";
  };

  buildInputs = [ nose ];
--- a/pkgs/development/python-modules/jdcal/default.nix
+++ b/pkgs/development/python-modules/jdcal/default.nix
@@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "jdcal";
-  version = "1.4";
+  version = "1.4.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "ea0a5067c5f0f50ad4c7bdc80abad3d976604f6fb026b0b3a17a9d84bb9046c9";
+    sha256 = "472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8";
  };

  checkInputs = [ pytest ];
--- a/pkgs/development/python-modules/jinja2/default.nix
+++ b/pkgs/development/python-modules/jinja2/default.nix
@@ -17,9 +17,6 @@ buildPythonPackage rec {
    pytest -v tests
  '';

-  # RecursionError: maximum recursion depth exceeded
-  doCheck = false;
-
  meta = with stdenv.lib; {
    homepage = http://jinja.pocoo.org/;
    description = "Stand-alone template engine";
--- a/pkgs/development/python-modules/junos-eznc/default.nix
+++ b/pkgs/development/python-modules/junos-eznc/default.nix
@@ -15,11 +15,11 @@

 buildPythonPackage rec {
  pname = "junos-eznc";
-  version = "2.2.0";
+  version = "2.2.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "d97d8babf650abca25a096825aa6d88573d340481a0b0793afcdac4a7bee09d3";
+    sha256 = "0133a10ba3d46ddf70f0ba6620aa3b92e5533f08c57edd000dbffd8fe60d586d";
  };


--- a/pkgs/development/python-modules/matplotlib/2.nix
+++ b/pkgs/development/python-modules/matplotlib/2.nix
@@ -60,7 +60,7 @@ buildPythonPackage rec {
      url = "https://github.com/matplotlib/matplotlib/commit/2980184d092382a40ab21f95b79582ffae6e19d6.patch";
      sha256 = "1c0wj28zy8s5h6qiavx9zzbhlmhjwpzbc3fyyw9039mbnqk0spg2";
    })
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv-2.2.3.patch ];
+  ];

  # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
  # corresponding interpreter object for its library paths. This fails if
--- a/pkgs/development/python-modules/matplotlib/darwin-stdenv-2.2.3.patch
+++ b/pkgs/development/python-modules/matplotlib/darwin-stdenv-2.2.3.patch
@@ -1,10 +0,0 @@
--- a/src/_macosx.m	2015-10-30 00:46:20.000000000 +0200
-+++ b/src/_macosx.m	2015-11-01 14:52:25.000000000 +0200
-@@ -6264,6 +6264,7 @@
- 
- static bool verify_framework(void)
- {
-+    return true;  /* nixpkgs darwin stdenv */
- #ifdef COMPILING_FOR_10_6
-     NSRunningApplication* app = [NSRunningApplication currentApplication];
-     NSApplicationActivationPolicy activationPolicy = [app activationPolicy];
--- a/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch
+++ b/pkgs/development/python-modules/matplotlib/darwin-stdenv.patch
@@ -1,12 +0,0 @@
-diff -ruN matplotlib-3.0.0/src/_macosx.m matplotlib-3.0.0.patched/src/_macosx.m
--- matplotlib-3.0.0/src/_macosx.m	2018-09-16 00:35:21.000000000 +0200
-+++ matplotlib-3.0.0.patched/src/_macosx.m	2018-11-03 13:14:33.000000000 +0100
-@@ -2577,6 +2577,7 @@
- 
- static bool verify_framework(void)
- {
-+    return true;  /* nixpkgs darwin stdenv */
-     ProcessSerialNumber psn;
-     /* These methods are deprecated, but they don't require the app to
-        have started  */
-
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -52,8 +52,7 @@ buildPythonPackage rec {
    ++ stdenv.lib.optionals enableQt [ pyqt4 ];

  patches =
-    [ ./basedirlist.patch ] ++
-    stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv.patch ];
+    [ ./basedirlist.patch ];

  # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
  # corresponding interpreter object for its library paths. This fails if
--- a/pkgs/development/python-modules/mecab-python3/default.nix
+++ b/pkgs/development/python-modules/mecab-python3/default.nix
@@ -7,11 +7,11 @@

 buildPythonPackage rec {
  pname = "mecab-python3";
-  version = "0.996.1";
+  version = "0.996.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "5aca4d0d196161e41452b89921042c0e61a6b7e7e9373211c0c1c50d1809055d";
+    sha256 = "a80383fba343dad247b486a9afa486b7f0ec6244cb8bbf2d6a24d2fab5f19180";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -1,14 +1,14 @@
-{ buildPythonPackage, fetchPypi, jinja2, werkzeug, flask
+{ buildPythonPackage, fetchPypi, jinja2, werkzeug, flask, cfn-lint
 , requests, pytz, backports_tempfile, cookies, jsondiff, botocore, aws-xray-sdk, docker, responses
 , six, boto, httpretty, xmltodict, nose, sure, boto3, freezegun, dateutil, mock, pyaml, python-jose }:

 buildPythonPackage rec {
  pname = "moto";
-  version = "1.3.7";
+  version = "1.3.8";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "129de2e04cb250d9f8b2c722ec152ed1b5426ef179b4ebb03e9ec36e6eb3fcc5";
+    sha256 = "9cb02134148fbe3ed81f11d6ab9bd71bbd6bc2db7e59a45de77fb1d0fedb744e";
  };

  postPatch = ''
@@ -24,6 +24,7 @@ buildPythonPackage rec {
    aws-xray-sdk
    boto
    boto3
+    cfn-lint
    dateutil
    flask
    httpretty
--- a/pkgs/development/python-modules/nameparser/default.nix
+++ b/pkgs/development/python-modules/nameparser/default.nix
@@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "nameparser";
-  version = "1.0.2";
+  version = "1.0.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0w1m8qva2d7xfqrdxsnh1cncr3ank2205i5rz44hawjh2frzmik2";
+    sha256 = "c01ec7d0bc093420a45d8b5ea8261a84ba12bff0cabf47cb15b716c5ea8f3d23";
  };

  LC_ALL="en_US.UTF-8";
--- a/pkgs/development/python-modules/nilearn/default.nix
+++ b/pkgs/development/python-modules/nilearn/default.nix
@@ -3,12 +3,12 @@

 buildPythonPackage rec {
  pname = "nilearn";
-  version = "0.5.1";
+  version = "0.5.2";
  name = pname + "-" + version;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "dca56e8a1f0fc6dcd1c997383187efc31788294ac6bcbbaebac2b9a962a44cbb";
+    sha256 = "18b763d641e6903bdf8512e0ec5cdc14133fb4679e9a15648415e9be62c81b56";
  };

  # disable some failing tests
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -16,18 +16,18 @@ let
  };
 in buildPythonPackage rec {
  pname = "numpy";
-  version = "1.16.2";
+  version = "1.16.3";

  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    sha256 = "1c4inssky16p6ab63n1gass6dik1dzxrp3y7kmxbdq6xg4w2wsbc";
+    sha256 = "78a6f89da87eeb48014ec652a65c4ffde370c036d780a995edaeb121d3625621";
  };

  nativeBuildInputs = [ gfortran pytest ];
  buildInputs = [ blas ];

-  patches = lib.optionals (python.hasDistutilsCxxPatch or false) [
+  patches = lib.optionals python.hasDistutilsCxxPatch [
    # We patch cpython/distutils to fix https://bugs.python.org/issue1222585
    # Patching of numpy.distutils is needed to prevent it from undoing the
    # patch to distutils.
--- a/pkgs/development/python-modules/objgraph/default.nix
+++ b/pkgs/development/python-modules/objgraph/default.nix
@@ -10,11 +10,11 @@

 buildPythonPackage rec {
  pname = "objgraph";
-  version = "3.4.0";
+  version = "3.4.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "4a0c2c6268e10a9e8176ae054ff3faac9a432087801e1f95c3ebbe52550295a0";
+    sha256 = "bf29512d7f8b457b53fa0722ea59f516abb8abc59b78f97f0ef81394a0c615a7";
  };

  # Tests fail with PyPy.
--- a/pkgs/development/python-modules/paho-mqtt/default.nix
+++ b/pkgs/development/python-modules/paho-mqtt/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonPackage, fetchFromGitHub, isPy3k
-, pytestrunner, pytest, mock }:
+, stdenv, pytestrunner, pytest, mock }:

 buildPythonPackage rec {
  pname = "paho-mqtt";
@@ -20,6 +20,8 @@ buildPythonPackage rec {

  checkInputs = [ pytestrunner pytest ] ++ lib.optional (!isPy3k) mock;

+  doCheck = !stdenv.isDarwin;
+
  meta = with lib; {
    homepage = https://eclipse.org/paho;
    description = "MQTT version 3.1.1 client class";
--- a/pkgs/development/python-modules/papis/default.nix
+++ b/pkgs/development/python-modules/papis/default.nix
@@ -5,6 +5,7 @@
 , prompt_toolkit, pygments
 #, optional, dependencies
 , jinja2, whoosh, pytest
+, stdenv
 }:

 buildPythonPackage rec {
@@ -28,6 +29,8 @@ buildPythonPackage rec {
    jinja2 whoosh
  ];

+  doCheck = !stdenv.isDarwin;
+
  checkInputs = ([
    pytest
  ]) ++ [
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "phonenumbers";
-  version = "8.10.9";
+  version = "8.10.10";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "d9cf2e8e4ad40552487ab47182bc9759fca1edaa7d513e95a9f20c6742416234";
+    sha256 = "dabc8cfcff96446b0787ea337739ea286ec3949ec27a4790a9b4587817da5c5f";
  };

  meta = {
--- a/pkgs/development/python-modules/pyasn1-modules/default.nix
+++ b/pkgs/development/python-modules/pyasn1-modules/default.nix
@@ -1,16 +1,32 @@
-{ stdenv, buildPythonPackage, fetchPypi, pyasn1, isPyPy }:
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pyasn1
+, isPyPy
+, pytest
+}:

 buildPythonPackage rec {
  pname = "pyasn1-modules";
-  version = "0.2.4";
+  version = "0.2.5";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "a52090e8c5841ebbf08ae455146792d9ef3e8445b21055d3a3b7ed9c712b7c7c";
+    sha256 = "ef721f68f7951fab9b0404d42590f479e30d9005daccb1699b0a51bb4177db96";
  };

  propagatedBuildInputs = [ pyasn1 ];

+  checkInputs = [
+    pytest
+  ];
+
+  # running tests through setup.py fails only for python2 for some reason:
+  # AttributeError: 'module' object has no attribute 'suitetests'
+  checkPhase = ''
+    py.test
+  '';
+
  meta = with stdenv.lib; {
    description = "A collection of ASN.1-based protocols modules";
    homepage = https://pypi.python.org/pypi/pyasn1-modules;
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -2,7 +2,7 @@

 buildPythonPackage rec {
  pname = "pycairo";
-  version = "1.18.0";
+  version = "1.18.1";

  format = "other";

@@ -12,7 +12,7 @@ buildPythonPackage rec {
    owner = "pygobject";
    repo = "pycairo";
    rev = "v${version}";
-    sha256 = "0k266cf477j74v7mv0d4jxaq3wx8b7qa85qgh68cn094gzaasqd9";
+    sha256 = "0f4l7d1ibkk8xdspyv5zx8fah9z3x775bd91zirnp37vlgqds7xj";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -3,13 +3,13 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }:

 buildPythonPackage rec {
  pname = "pygobject";
-  version = "3.32.0";
+  version = "3.32.1";

  format = "other";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0agg8nxgqp96wyw4qnjjpiczf0j8aw454plwsfqccsyykzjxgx43";
+    sha256 = "1n04dnvq3bx7vk7pgnxlg6kiwnc7xxv9bjabkv7abpmqjkprvj9j";
  };

  outputs = [ "out" "dev" ];
--- a/pkgs/development/python-modules/pyro-ppl/default.nix
+++ b/pkgs/development/python-modules/pyro-ppl/default.nix
@@ -1,12 +1,12 @@
 { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2
 , graphviz, networkx, six, opt-einsum, tqdm }:
 buildPythonPackage rec {
-  version = "0.3.1.post1";
+  version = "0.3.2";
  pname = "pyro-ppl";

  src = fetchPypi {
    inherit version pname;
-    sha256 = "f5174bcd1b74fb455db948413dcbf5ac1a13dbddc6c54c6d215dd2e4b6b9548d";
+    sha256 = "f00db7e7747e016479ef65e3f00115d66a4200e59914f016d50e4d3e32bc94b0";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/pyrr/default.nix
+++ b/pkgs/development/python-modules/pyrr/default.nix
@@ -7,12 +7,12 @@
 }:

 buildPythonPackage rec {
-  version = "0.10.2";
+  version = "0.10.3";
  pname = "pyrr";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1q9i4qa6ygr8hlpnw55s58naynxzwm0sc1m54wyy1ghbf8m8d2f0";
+    sha256 = "3c0f7b20326e71f706a610d58f2190fff73af01eef60c19cb188b186f0ec7e1d";
  };

  buildInputs = [ setuptools ];
--- a/pkgs/development/python-modules/pyspark/default.nix
+++ b/pkgs/development/python-modules/pyspark/default.nix
@@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "pyspark";
-  version = "2.4.1";
+  version = "2.4.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "923cc4075d586074f68b722f5ed029b0d25396828441b5ed421a0e40fe14e749";
+    sha256 = "5ab07ed12c3c9035bfaad93921887736abf89130130b38de7dfa985e50542438";
  };

  # pypandoc is broken with pandoc2, so we just lose docs.
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "pytest-mock";
-  version = "1.10.3";
+  version = "1.10.4";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "330bfa1a71c9b6e84e2976f01d70d8a174f755e7f9dc5b22f4b7335992e1e98b";
+    sha256 = "5bf5771b1db93beac965a7347dc81c675ec4090cb841e49d9d34637a25c30568";
  };

  propagatedBuildInputs = lib.optional (!isPy3k) mock;
--- a/pkgs/development/python-modules/ruamel_yaml/default.nix
+++ b/pkgs/development/python-modules/ruamel_yaml/default.nix
@@ -8,11 +8,11 @@

 buildPythonPackage rec {
  pname = "ruamel.yaml";
-  version = "0.15.92";
+  version = "0.15.94";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "c6d05e38a141922eca7902135e7a40b605763d6da8ec6624517370631ce9fb6d";
+    sha256 = "0939bcb399ad037ef903d74ccf2f8a074f06683bc89133ad19305067d34487c8";
  };

  # Tests cannot load the module to test
--- a/pkgs/development/python-modules/s3fs/default.nix
+++ b/pkgs/development/python-modules/s3fs/default.nix
@@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "s3fs";
-  version = "0.2.0";
+  version = "0.2.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1p14sm3lbkwz2fidiinmyfyxwkh58ymjb0c0bsv5i0zfv0fy87x3";
+    sha256 = "2146aae91ba3a06d7bfa7130688219599f8696d2825fb00f62923bb56f6e7ed3";
  };

  buildInputs = [ docutils ];
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -8,13 +8,13 @@
 # Should use buildPythonPackage here somehow
 stdenv.mkDerivation rec {
  pname = "setuptools";
-  version = "41.0.0";
+  version = "41.0.1";
  name = "${python.libPrefix}-${pname}-${version}";

  src = fetchPypi {
    inherit pname version;
    extension = "zip";
-    sha256 = "79d30254b6fe7a8e672e43cd85f13a9f3f2a50080bc81d851143e2219ef0dcb1";
+    sha256 = "a222d126f5471598053c9a77f4b5d4f26eaa1f150ad6e01dcf1a42e185d05613";
  };

  nativeBuildInputs = [ unzip wrapPython python.pythonForBuild ];
--- a/pkgs/development/python-modules/smart_open/default.nix
+++ b/pkgs/development/python-modules/smart_open/default.nix
@@ -12,11 +12,11 @@

 buildPythonPackage rec {
  pname = "smart_open";
-  version = "1.8.1";
+  version = "1.8.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0a38mwlz92mlaxz8f8z4yyacpgykiysbcwfykrgr74vlic8x4m5i";
+    sha256 = "d3c16477ad7e8f94ab033630ea31993670ad21153172367db1acb143077d501c";
  };

  # nixpkgs version of moto is >=1.2.0, remove version pin to fix build
--- a/pkgs/development/python-modules/sparqlwrapper/default.nix
+++ b/pkgs/development/python-modules/sparqlwrapper/default.nix
@@ -10,11 +10,11 @@

 buildPythonPackage rec {
  pname = "SPARQLWrapper";
-  version = "1.8.2";
+  version = "1.8.4";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "7f4c8d38ea1bfcffbc358c9a05de35a3fd7152cc3e8ea57963ee7a0a242f7a5e";
+    sha256 = "21928e7a97f565e772cdeeb0abad428960f4307e3a13dbdd8f6d3da8a6a506c9";
  };

  # break circular dependency loop
--- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix
@@ -21,6 +21,8 @@ buildPythonPackage rec {
  checkInputs = [ unittest2 scripttest pytz mock testtools testrepository ];
  propagatedBuildInputs = [ pbr tempita decorator sqlalchemy six sqlparse ];

+  doCheck = !stdenv.isDarwin;
+
  prePatch = ''
    sed -i -e /tempest-lib/d \
           -e /testtools/d \
--- a/pkgs/development/python-modules/sseclient/default.nix
+++ b/pkgs/development/python-modules/sseclient/default.nix
@@ -4,11 +4,11 @@

 buildPythonPackage rec {
  pname = "sseclient";
-  version = "0.0.23";
+  version = "0.0.24";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "82a1d281b2bcb98847882069bde57a6772156f9539ddefbb78fea4f915197ec3";
+    sha256 = "1b4c5119b9381cb6ddaf3236f3f7e1437a14e488d1ed61336873a839788481b0";
  };

  propagatedBuildInputs = [ requests six ];
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -1,10 +1,10 @@
 { buildPythonPackage, fetchPypi, lib, pythonOlder }:
 buildPythonPackage rec {
  pname = "typed-ast";
-  version = "1.3.1";
+  version = "1.3.4";
  src = fetchPypi{
    inherit pname version;
-    sha256 = "606d8afa07eef77280c2bf84335e24390055b478392e1975f96286d99d0cb424";
+    sha256 = "68c362848d9fb71d3c3e5f43c09974a0ae319144634e7a47db62f0f2a54a7fa7";
  };
  # Only works with Python 3.3 and newer;
  disabled = pythonOlder "3.3";
--- a/pkgs/development/python-modules/urllib3/default.nix
+++ b/pkgs/development/python-modules/urllib3/default.nix
@@ -4,11 +4,11 @@

 buildPythonPackage rec {
  pname = "urllib3";
-  version = "1.24.1";
+  version = "1.24.2";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22";
+    sha256 = "9a247273df709c4fedb38c711e44292304f73f39ab01beda9f6b9fc375669ac3";
  };

  NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
--- a/pkgs/development/python-modules/xkcdpass/default.nix
+++ b/pkgs/development/python-modules/xkcdpass/default.nix
@@ -5,11 +5,11 @@

 buildPythonPackage rec {
  pname = "xkcdpass";
-  version = "1.17.2";
+  version = "1.17.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "ae7ad57c0287cc41c8c9f164b59296463f2e009d4b7aed382160cb40dfb4d91b";
+    sha256 = "95cf3fd41130606ba64ec7edb9efac7c5d61efe21abab51a2c21ccbbebc48bb6";
  };

  # No tests included
--- a/pkgs/development/python-modules/xlib/default.nix
+++ b/pkgs/development/python-modules/xlib/default.nix
@@ -30,6 +30,8 @@ buildPythonPackage rec {
  buildInputs = [ xorg.libX11 ];
  propagatedBuildInputs = [ six ];

+  doCheck = !stdenv.isDarwin;
+
  meta = with stdenv.lib; {
    description = "Fully functional X client library for Python programs";
    homepage = http://python-xlib.sourceforge.net/;
--- a/pkgs/development/python-modules/xml2rfc/default.nix
+++ b/pkgs/development/python-modules/xml2rfc/default.nix
@@ -1,5 +1,6 @@
 { lib, fetchPypi, buildPythonPackage, intervaltree, pyflakes, requests, lxml, google-i18n-address
 , pycountry, html5lib, six
+, stdenv
 }:

 buildPythonPackage rec {
@@ -26,6 +27,8 @@ buildPythonPackage rec {
    export HOME=$(mktemp -d)
  '';

+  doCheck = !stdenv.isDarwin;
+
  meta = with lib; {
    description = "Tool generating IETF RFCs and drafts from XML sources";
    homepage = https://tools.ietf.org/tools/xml2rfc/trac/;
--- a/pkgs/development/python-modules/zope_testrunner/default.nix
+++ b/pkgs/development/python-modules/zope_testrunner/default.nix
@@ -19,6 +19,8 @@ buildPythonPackage rec {

  propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ];

+  doCheck = !stdenv.isDarwin;
+
  meta = with stdenv.lib; {
    description = "A flexible test runner with layer support";
    homepage = https://pypi.python.org/pypi/zope.testrunner;