Merge branch 'master' into staging-next

2019-10-12 00:50:21 +02:00
parent a0c34f54cc 8b57a7573c
commit 6c8aed6391
440 changed files with 19793 additions and 9783 deletions
--- a/pkgs/development/python-modules/asyncpg/default.nix
+++ b/pkgs/development/python-modules/asyncpg/default.nix
@@ -3,21 +3,14 @@

 buildPythonPackage rec {
  pname = "asyncpg";
-  version = "0.18.3";
+  version = "0.19.0";
  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0rrch478ww6ipmh3617sb2jzwsq4w7pjcck869p35zb0mk5fr9aq";
+    sha256 = "0sp3m6sgw83rhvg87y78lhk4xxx58ffzyf9rsq5f1a7b8azbnlxj";
  };

-  patches = [
-    (fetchpatch {
-      url = "https://github.com/MagicStack/asyncpg/commit/aaeb7076e5acb045880b46155014c0640624797e.patch";
-      sha256 = "0l420cmk7469wgb1xq2rxinvja1f2brb5cm4smj2s2wqgymbrf6h";
-    })
-  ];
-
  checkInputs = [
    uvloop
    postgresql
--- a/pkgs/development/python-modules/avro/default.nix
+++ b/pkgs/development/python-modules/avro/default.nix
@@ -2,12 +2,12 @@

 buildPythonPackage rec {
  pname = "avro";
-  version = "1.9.0";
+  version = "1.9.1";
  disabled = isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0af72fcql34v30cvjqm9nmz68rl35znn5qbd4k3b9ks02xzy3b2y";
+    sha256 = "16pvgdv5pqx4zgjj0a4v5fz4brfjcrfx72mcmyvb2xqqp7q6ph4z";
  };

  meta = with stdenv.lib; {
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -11,11 +11,11 @@

 buildPythonPackage rec {
  pname = "awkward";
-  version = "0.12.12";
+  version = "0.12.13";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "316abd04dd049d56567082670ae8800c265dc3f06b699cf2a953ea6aea7696ce";
+    sha256 = "0jciasfmayk3xs8lprrdjd6brvy614yd2ngpgyzlszis5sa6nr18";
  };

  nativeBuildInputs = [ pytestrunner ];
--- a/pkgs/development/python-modules/bidict/default.nix
+++ b/pkgs/development/python-modules/bidict/default.nix
@@ -7,11 +7,13 @@
 , pytest-benchmark
 , sortedcollections
 , sortedcontainers
+, isPy3k
 }:

 buildPythonPackage rec {
  pname = "bidict";
  version = "0.18.2";
+  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/block-io/default.nix
+++ b/pkgs/development/python-modules/block-io/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six }:
+{ stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six, setuptools }:

 buildPythonPackage rec {
  pname = "block-io";
@@ -15,6 +15,7 @@ buildPythonPackage rec {
    pycryptodome
    requests
    six
+    setuptools
  ];

  preConfigure = ''
--- a/pkgs/development/python-modules/braintree/default.nix
+++ b/pkgs/development/python-modules/braintree/default.nix
@@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "braintree";
-  version = "3.56.0";
+  version = "3.57.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1d1xv7b4s68yfa3snnvcjldj0q7v1izpyvqkv2c1k0w73hl657b5";
+    sha256 = "1g5w733dim3rc6hwklvknnxqkradjwip728i77pbsw5ihgdxahhi";
  };

  propagatedBuildInputs = [ requests ];
--- a/pkgs/development/python-modules/cartopy/default.nix
+++ b/pkgs/development/python-modules/cartopy/default.nix
@@ -1,5 +1,5 @@
 { buildPythonPackage, lib, fetchPypi
-, pytest, filelock, mock, pep8
+, pytest_4, filelock, mock, pep8
 , cython, isPy27
 , six, pyshp, shapely, geos, numpy
 , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
@@ -17,7 +17,7 @@ buildPythonPackage rec {
    sha256 = "0q9ckfi37cxj7jwnqnzij62vwcf4krccx576vv5lhvpgvplxjjs2";
  };

-  checkInputs = [ filelock mock pytest pep8 ];
+  checkInputs = [ filelock mock pytest_4 pep8 ];

  # several tests require network connectivity: we disable them.
  # also py2.7's tk is over-eager in trying to open an x display,
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -1,70 +1,46 @@
-{ stdenv
-, libev
-, buildPythonPackage
-, fetchPypi
+{ stdenv, lib, buildPythonPackage, fetchPypi, python, pythonOlder
 , cython
-, futures
-, six
-, python
-, scales
 , eventlet
-, twisted
+, futures
+, libev
 , mock
-, gevent
 , nose
+, pytest
 , pytz
 , pyyaml
+, scales
+, six
 , sure
-, pythonOlder
 }:

 buildPythonPackage rec {
  pname = "cassandra-driver";
-  version = "3.18.0";
+  version = "3.19.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1w9a7fdl626m977cjj9zclh4a0mr3s4q9jpwm1fsmpi7v3gbribi";
+    sha256 = "1vy9yzsd9c29irq99m8lpkgnc634waai2phvr6b89pmmdirp2wm9";
  };

-  buildInputs = [
-    libev
-  ];
-
-  nativeBuildInputs = [
-    # NOTE: next version will work with cython 0.29
-    # Requires 'Cython!=0.25,<0.29,>=0.20'
-    (cython.overridePythonAttrs(old: rec {
-      pname = "Cython";
-      version = "0.28.3";
-      src = fetchPypi {
-        inherit pname version;
-        sha256 = "1aae6d6e9858888144cea147eb5e677830f45faaff3d305d77378c3cba55f526";
-      };
-    }))
-  ];
-
+  nativeBuildInputs = [ cython ];
+  buildInputs = [ libev ];
  propagatedBuildInputs = [ six ]
-    ++ stdenv.lib.optionals (pythonOlder "3.4") [ futures ];
+    ++ lib.optionals (pythonOlder "3.4") [ futures ];

-  postPatch = ''
-    sed -i "s/<=1.0.1//" setup.py
-  '';
+  checkInputs = [ eventlet mock nose pytest pytz pyyaml sure ];

+  # ignore test files which try to do socket.getprotocolname('tcp')
+  # as it fails in sandbox mode due to lack of a /etc/protocols file
  checkPhase = ''
-    ${python.interpreter} setup.py gevent_nosetests
-    ${python.interpreter} setup.py eventlet_nosetests
+    pytest tests/unit \
+      --ignore=tests/unit/io/test_libevreactor.py \
+      --ignore=tests/unit/io/test_eventletreactor.py \
+      --ignore=tests/unit/io/test_asyncorereactor.py
  '';

-  checkInputs = [ scales eventlet twisted mock gevent nose pytz pyyaml sure ];
-
-  # Could not get tests running
-  doCheck = false;
-
-  meta = with stdenv.lib; {
-    homepage = http://datastax.github.io/python-driver/;
+  meta = with lib; {
    description = "A Python client driver for Apache Cassandra";
+    homepage = "http://datastax.github.io/python-driver";
    license = licenses.asl20;
  };
-
 }
--- 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.2.2";
+  version = "7.2.3";

  buildInputs = [ odpic ];

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1kp6fgyln0jkdbjm20h6rhybsmvqjj847frhsndyfvkf38m32ss0";
+    sha256 = "1b1zarb6g1b2nl3bj9m5ph1sxqc44bscwq30300q78hm666sbf6z";
  };

  preConfigure = ''
--- a/pkgs/development/python-modules/diff-match-patch/default.nix
+++ b/pkgs/development/python-modules/diff-match-patch/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, python }:

 buildPythonPackage rec {
  pname = "diff-match-patch";
@@ -14,4 +14,8 @@ buildPythonPackage rec {
    inherit pname version;
    sha256 = "a809a996d0f09b9bbd59e9bbd0b71eed8c807922512910e05cbd3f9480712ddb";
  };
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest -v diff_match_patch.tests
+  '';
 }
--- a/pkgs/development/python-modules/django-pipeline/default.nix
+++ b/pkgs/development/python-modules/django-pipeline/default.nix
@@ -32,5 +32,6 @@ buildPythonPackage rec {
    description = "Pipeline is an asset packaging library for Django";
    homepage = https://github.com/cyberdelia/django-pipeline;
    license = licenses.mit;
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/django_evolution/default.nix
+++ b/pkgs/development/python-modules/django_evolution/default.nix
@@ -21,6 +21,7 @@ buildPythonPackage rec {
    description = "A database schema evolution tool for the Django web framework";
    homepage = http://code.google.com/p/django-evolution/;
    license = licenses.bsd0;
+    broken = true;
  };

 }
--- a/pkgs/development/python-modules/django_taggit/default.nix
+++ b/pkgs/development/python-modules/django_taggit/default.nix
@@ -6,12 +6,13 @@
 , django
 , mock
 , isort
+, isPy3k
 }:

 buildPythonPackage rec {
  pname = "django-taggit";
  version = "1.1.0";
-  disabled = pythonOlder "2.7";
+  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/dugong/default.nix
+++ b/pkgs/development/python-modules/dugong/default.nix
@@ -2,13 +2,13 @@

 buildPythonPackage rec {
  pname = "dugong";
-  version = "3.7.4";
+  version = "3.7.5";

  disabled = pythonOlder "3.3"; # Library does not support versions older than 3.3

  src = fetchPypi {
    inherit pname version;
    extension = "tar.bz2";
-    sha256 = "1fb9kwib6jsd09bxiz70av6g0blscygkx7xzaz1b7ibd28ms77zd";
+    sha256 = "10vjdp21m0gzm096lgl84z184s5l9iz69ppj6acgsc125037dl6h";
  };
 }
--- a/pkgs/development/python-modules/exchangelib/default.nix
+++ b/pkgs/development/python-modules/exchangelib/default.nix
@@ -28,5 +28,6 @@ buildPythonPackage rec {
    homepage    = "https://github.com/ecederstrand/exchangelib";
    license     = licenses.bsd2;
    maintainers = with maintainers; [ catern ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/filterpy/default.nix
+++ b/pkgs/development/python-modules/filterpy/default.nix
@@ -5,11 +5,13 @@
 , scipy
 , matplotlib
 , pytest
+, isPy3k
 }:

 buildPythonPackage rec {
  version = "1.4.5";
  pname = "filterpy";
+  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
+{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
 , attrs, click, cligj, click-plugins, six, munch, enum34
-, pytest, boto3, mock
+, pytest, boto3, mock, giflib
 , gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745
 }:

 buildPythonPackage rec {
  pname = "Fiona";
-  version = "1.8.6";
+  version = "1.8.8";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0gpvdrayam4qvpqvz0911nlyvf7ib3slsyml52qx172vhpldycgs";
+    sha256 = "10qym4anwh0mgfgkhrz6cimkv7af3rd49290k497icq36bkkn73i";
  };

-  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
+  CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";

  nativeBuildInputs = [
    gdal_2 # for gdal-config
@@ -21,7 +21,7 @@ buildPythonPackage rec {

  buildInputs = [
    gdal_2
-  ];
+  ] ++ lib.optionals stdenv.cc.isClang [ giflib ];

  propagatedBuildInputs = [
    attrs
@@ -30,12 +30,12 @@ buildPythonPackage rec {
    click-plugins
    six
    munch
-  ] ++ stdenv.lib.optional (!isPy3k) enum34;
+  ] ++ lib.optional (!isPy3k) enum34;

  checkInputs = [
    pytest
    boto3
-  ] ++ stdenv.lib.optional (pythonOlder "3.4") mock;
+  ] ++ lib.optional (pythonOlder "3.4") mock;

  checkPhase = ''
    rm -r fiona # prevent importing local fiona
@@ -45,7 +45,7 @@ buildPythonPackage rec {
           and not test_*_wheel"
  '';

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "OGR's neat, nimble, no-nonsense API for Python";
    homepage = http://toblerity.org/fiona/;
    license = licenses.bsd3;
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -6,11 +6,13 @@
 , scipy
 , smart_open
 , scikitlearn, testfixtures, unittest2
+, isPy3k
 }:

 buildPythonPackage rec {
  pname = "gensim";
  version = "3.8.0";
+  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/geopy/default.nix
+++ b/pkgs/development/python-modules/geopy/default.nix
@@ -25,6 +25,7 @@ buildPythonPackage rec {
    homepage = "https://github.com/geopy/geopy";
    description = "Python Geocoding Toolbox";
    license = licenses.mit;
+    broken = true;
  };

 }
--- a/pkgs/development/python-modules/gmusicapi/default.nix
+++ b/pkgs/development/python-modules/gmusicapi/default.nix
@@ -20,11 +20,11 @@

 buildPythonPackage rec {
  pname = "gmusicapi";
-  version = "12.0.0";
+  version = "12.1.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "6e066f38bbfce068e0e89f34ccdbc7056fd5fdc446d3c33c70f53b26078eb78b";
+    sha256 = "1cgjxqi4a18zp5dx7v71h6wiy3cvggyydkrs008dsfgyhg8s89d8";
  };

  propagatedBuildInputs = [ validictory decorator mutagen protobuf setuptools requests dateutil proboscis mock appdirs oauth2client pyopenssl gpsoauth MechanicalSoup future ];
--- a/pkgs/development/python-modules/jaraco_text/default.nix
+++ b/pkgs/development/python-modules/jaraco_text/default.nix
@@ -4,10 +4,10 @@

 buildPythonPackage rec {
  pname = "jaraco.text";
-  version = "3.0";
+  version = "3.0.1";
  src = fetchPypi {
    inherit pname version;
-    sha256 = "1l5hq2jvz9xj05aayc42f85v8wx8rpi16lxph8blw51wgnvymsyx";
+    sha256 = "08n14knfarc3v9jibkl1pbcq2fd95cmz61wc6n4y922ccnrqn9gc";
  };
  doCheck = false;
  buildInputs =[ setuptools_scm ];
--- a/pkgs/development/python-modules/jenkinsapi/default.nix
+++ b/pkgs/development/python-modules/jenkinsapi/default.nix
@@ -26,6 +26,7 @@ buildPythonPackage rec {
    homepage = https://github.com/salimfadhley/jenkinsapi;
    maintainers = with maintainers; [ drets ];
    license = licenses.mit;
+    broken = true;
  };

 }
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -5,11 +5,11 @@

 buildPythonPackage rec {
  pname = "ledgerblue";
-  version = "0.1.28";
+  version = "0.1.29";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1jfh4gb3f16ga1ircwiyg7dldldmhn0a5slbpqsqr2g6mlqihpmd";
+    sha256 = "14zv8bp62r1fwrrpbwyg9a3s5dl76lbhd8lv16xim0w55p9vvixn";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/limnoria/default.nix
+++ b/pkgs/development/python-modules/limnoria/default.nix
@@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "limnoria";
-  version = "2019.02.23";
+  version = "2019.09.08";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0rlv9l1w80n2jpw2yy1g6x83rvldwzkmkafdalxkar32czbi2xv4";
+    sha256 = "0l50smy3hai6pb6lwvcgzrx6yfzshqlvx8ym5my1ji07ilnasmmp";
  };

  patchPhase = ''
--- a/pkgs/development/python-modules/maildir-deduplicate/default.nix
+++ b/pkgs/development/python-modules/maildir-deduplicate/default.nix
@@ -21,6 +21,7 @@ buildPythonPackage rec {
    description = "Command-line tool to deduplicate mails from a set of maildir folders";
    homepage = "https://github.com/kdeldycke/maildir-deduplicate";
    license = licenses.gpl2;
+    broken = true;
  };

 }
--- a/pkgs/development/python-modules/minidb/default.nix
+++ b/pkgs/development/python-modules/minidb/default.nix
@@ -6,6 +6,7 @@
 buildPythonPackage rec {
  pname = "minidb";
  version = "2.0.2";
+  disabled = !isPy3k;

  src = fetchFromGitHub {
    owner = "thp";
--- a/pkgs/development/python-modules/moviepy/default.nix
+++ b/pkgs/development/python-modules/moviepy/default.nix
@@ -25,13 +25,13 @@ assert advancedProcessing -> (

 buildPythonPackage rec {
  pname = "moviepy";
-  version = "1.0.0";
+  version = "1.0.1";

  disabled = !(pythonAtLeast "3.4");

  src = fetchPypi {
    inherit pname version;
-    sha256 = "16c7ffca23d90c76dd7b163f648c8166dfd589b7c180b8ff75aa327ae0a2fc6d";
+    sha256 = "1vgi9k1r4f5s9hzfzlhmmc574n80aq713ahv8cnbj3jci070lnwx";
  };

  # No tests, require network connection
--- a/pkgs/development/python-modules/nbsphinx/default.nix
+++ b/pkgs/development/python-modules/nbsphinx/default.nix
@@ -12,11 +12,11 @@

 buildPythonPackage rec {
  pname = "nbsphinx";
-  version = "0.4.2";
+  version = "0.4.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "b794219e465b3aab500b800884ff40fd152bb19d8b6f87580de1f3a07170aef8";
+    sha256 = "09j47hmzgvf7rnz7n4n7295pp6qscq9hp50qva70vglzqck9yyjp";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/nbval/default.nix
+++ b/pkgs/development/python-modules/nbval/default.nix
@@ -15,11 +15,11 @@

 buildPythonPackage rec {
  pname = "nbval";
-  version = "0.9.2";
+  version = "0.9.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0g8xl4158ngyhiynrkk72jpawnk4isznbijz0w085g269fps0vp2";
+    sha256 = "0613drjl740ppam3spm4b8mdcwwvl1lfmqy3vkgznbvzfxfpb3zj";
  };

  checkInputs = [
--- a/pkgs/development/python-modules/openrazer/daemon.nix
+++ b/pkgs/development/python-modules/openrazer/daemon.nix
@@ -20,10 +20,10 @@ in
 buildPythonApplication (common // rec {
  pname = "openrazer_daemon";

-  sourceRoot = "source/daemon";
-
  disabled = !isPy3k;

+  sourceRoot = "source/daemon";
+
  outputs = [ "out" "man" ];

  nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
--- a/pkgs/development/python-modules/paperspace/default.nix
+++ b/pkgs/development/python-modules/paperspace/default.nix
@@ -22,5 +22,6 @@ buildPythonPackage rec {
    license     = licenses.isc;
    platforms   = platforms.unix;
    maintainers = with maintainers; [ thoughtpolice ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/periodictable/default.nix
+++ b/pkgs/development/python-modules/periodictable/default.nix
@@ -2,13 +2,13 @@

 buildPythonPackage rec{
  pname = "periodictable";
-  version = "1.5.0";
+  version = "1.5.1";

  propagatedBuildInputs = [numpy pyparsing];

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1cjk6aqcz41nxm4fpriz01vqdafd6g57cjk0wh1iklk5cx6c085h";
+    sha256 = "0qd7rjhlnb2xxi7rhpidh9pabg2m4rq6zhdcsyiymni8mgjm8dfg";
  };

  meta = {
--- a/pkgs/development/python-modules/pgsanity/default.nix
+++ b/pkgs/development/python-modules/pgsanity/default.nix
@@ -31,5 +31,6 @@ buildPythonPackage rec {
    '';
    license = stdenv.lib.licenses.mit;
    maintainers = with maintainers; [ nalbyuites ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/piccata/default.nix
+++ b/pkgs/development/python-modules/piccata/default.nix
@@ -1,8 +1,9 @@
-{ buildPythonPackage, fetchPypi, lib, ipaddress }:
+{ buildPythonPackage, fetchPypi, lib, ipaddress, isPy3k }:

 buildPythonPackage rec {
  pname = "piccata";
  version = "1.0.1";
+  disabled = isPy3k;

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -50,5 +50,6 @@ buildPythonPackage rec {
    homepage = https://github.com/jazzband/pip-tools/;
    license = licenses.bsd3;
    maintainers = with maintainers; [ zimbatm ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/poetry/default.nix
+++ b/pkgs/development/python-modules/poetry/default.nix
@@ -87,5 +87,6 @@ in buildPythonPackage rec {
    description = "Python dependency management and packaging made easy";
    license = licenses.mit;
    maintainers = with maintainers; [ jakewaksbaum ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/prompt_toolkit/default.nix
+++ b/pkgs/development/python-modules/prompt_toolkit/default.nix
@@ -8,11 +8,11 @@

 buildPythonPackage rec {
  pname = "prompt_toolkit";
-  version = "2.0.9";
+  version = "2.0.10";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "2519ad1d8038fd5fc8e770362237ad0364d16a7650fb5724af6997ed5515e3c1";
+    sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi";
  };
  checkPhase = ''
    py.test -k 'not test_pathcompleter_can_expanduser'
--- a/pkgs/development/python-modules/ptpython/default.nix
+++ b/pkgs/development/python-modules/ptpython/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments }:
+{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments, isPy3k }:

 buildPythonPackage rec {
  pname = "ptpython";
  version = "2.0.4";
+  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -29,5 +29,6 @@ buildPythonPackage rec {
    license = with stdenv.lib.licenses; [ gpl3 ];
    maintainers = with stdenv.lib.maintainers; [ vinymeuh ];
    platforms = with stdenv.lib.platforms; linux ++ darwin;
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/py3status/default.nix
+++ b/pkgs/development/python-modules/py3status/default.nix
@@ -8,6 +8,7 @@
 , pydbus
 , pygobject3
 , pyserial
+, setuptools

 , file
 , acpi
@@ -30,7 +31,9 @@ buildPythonPackage rec {
  };

  doCheck = false;
-  propagatedBuildInputs = [ pytz requests tzlocal i3ipc pydbus pygobject3 pyserial ];
+  propagatedBuildInputs = [
+    pytz requests tzlocal i3ipc pydbus pygobject3 pyserial setuptools
+  ];
  buildInputs = [ file ];
  prePatch = ''
    sed -i -e "s|'file|'${file}/bin/file|" py3status/parse_config.py
--- a/pkgs/development/python-modules/pybfd/default.nix
+++ b/pkgs/development/python-modules/pybfd/default.nix
@@ -24,5 +24,6 @@ buildPythonPackage {
    license = lib.licenses.gpl2;
    platforms = lib.platforms.linux;
    maintainers = with lib.maintainers; [ orivej ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "PyChromecast";
-  version = "3.2.3";
+  version = "4.0.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1fhh3djb6chs23j46hwzm1rd6hypkl517vjmmg44rxnslkcl7dhb";
+    sha256 = "06f83bv3sri1m4yw64hmb1k7n46pma6m2ik84c3lmc8b6j7z53fr";
  };

  disabled = !isPy3k;
--- a/pkgs/development/python-modules/pyezminc/default.nix
+++ b/pkgs/development/python-modules/pyezminc/default.nix
@@ -29,5 +29,6 @@ buildPythonPackage rec {
    description = "Python API for libminc using EZMINC";
    license = stdenv.lib.licenses.gpl2;
    maintainers = with stdenv.lib.maintainers; [ bcdarwin ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/pygbm/default.nix
+++ b/pkgs/development/python-modules/pygbm/default.nix
@@ -42,5 +42,6 @@ buildPythonPackage rec {
    homepage = https://github.com/ogrisel/pygbm;
    license = licenses.mit;
    maintainers = [ maintainers.costrouc ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -2,13 +2,13 @@

 buildPythonPackage rec {
  pname = "pyhomematic";
-  version = "0.1.59";
+  version = "0.1.60";

  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "4406d9bf49d570ef0ba80be9cf8eb4bd75c08a2909369ebd90b8e94ff07f116e";
+    sha256 = "0af06249988d3d38f01c4464e28fb895f5a22304fe479269c6e56d7c69df0b31";
  };

  # PyPI tarball does not include tests/ directory
--- a/pkgs/development/python-modules/pykickstart/default.nix
+++ b/pkgs/development/python-modules/pykickstart/default.nix
@@ -3,12 +3,14 @@
 , fetchurl
 , urlgrabber
 , python
+, isPy3k
 }:

 buildPythonPackage rec {
  pname = "pykickstart";
  version = "1.99.39";
  md5_path = "d249f60aa89b1b4facd63f776925116d";
+  disabled = isPy3k;

  src = fetchurl {
    url = "https://src.fedoraproject.org/repo/pkgs/pykickstart/"
--- a/pkgs/development/python-modules/pylibmc/default.nix
+++ b/pkgs/development/python-modules/pylibmc/default.nix
@@ -1,12 +1,12 @@
 { buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib, cyrus_sasl }:

 buildPythonPackage rec {
-  version = "1.6.0";
+  version = "1.6.1";
  pname = "pylibmc";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1n6nvvhl0g52gpzzwdj1my6049xljkfwyxxygnwda9smrbj7pyay";
+    sha256 = "1sg7d9j0v6g3xg3finf4l1hb72c13vcyyi6rqrc9shbx903d93ca";
  };

  buildInputs = [ libmemcached zlib cyrus_sasl ];
--- a/pkgs/development/python-modules/pyro-ppl/default.nix
+++ b/pkgs/development/python-modules/pyro-ppl/default.nix
@@ -34,5 +34,6 @@ buildPythonPackage rec {
    homepage = http://pyro.ai;
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ teh ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/pysonos/default.nix
+++ b/pkgs/development/python-modules/pysonos/default.nix
@@ -13,13 +13,13 @@

 buildPythonPackage rec {
  pname = "pysonos";
-  version = "0.0.22";
+  version = "0.0.23";

  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "4a4fe630b97c81261246a448fe9dd2bdfaacd7df4453cf72f020599171416442";
+    sha256 = "0kc2j2wl1bblqzay9gd3frd3imvylxjkqrp6jxixc4kmiivbg8h8";
  };

  propagatedBuildInputs = [ xmltodict requests ifaddr ];
--- a/pkgs/development/python-modules/pyspf/default.nix
+++ b/pkgs/development/python-modules/pyspf/default.nix
@@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "pyspf";
-  version = "2.0.12";
+  version = "2.0.13";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "18j1rmbmhih7q6y12grcj169q7sx1986qn4gmpla9y5gwfh1p8la";
+    sha256 = "16wjj99d2pikz6z1gwnl1jjvad6qjgpsf3a85lh47qqrjpiipp32";
  };

  propagatedBuildInputs = [ pydns ];
--- a/pkgs/development/python-modules/pysvn/default.nix
+++ b/pkgs/development/python-modules/pysvn/default.nix
@@ -53,6 +53,7 @@ buildPythonPackage rec {
    description = "Python bindings for Subversion";
    homepage = http://pysvn.tigris.org/;
    license = licenses.asl20;
+    broken = true;
  };

 }
--- a/pkgs/development/python-modules/python-jenkins/default.nix
+++ b/pkgs/development/python-modules/python-jenkins/default.nix
@@ -4,6 +4,7 @@
 , mock
 , pbr
 , pyyaml
+, setuptools
 , six
 , multi_key_dict
 , testscenarios
@@ -22,7 +23,7 @@ buildPythonPackage rec {
  };

  buildInputs = [ mock ];
-  propagatedBuildInputs = [ pbr pyyaml six multi_key_dict requests ];
+  propagatedBuildInputs = [ pbr pyyaml setuptools six multi_key_dict requests ];

  checkInputs = [ unittest2 testscenarios requests-mock ];
  checkPhase = ''
--- a/pkgs/development/python-modules/python-rapidjson/default.nix
+++ b/pkgs/development/python-modules/python-rapidjson/default.nix
@@ -8,13 +8,13 @@
 }:

 buildPythonPackage rec {
-  version = "0.7.2";
+  version = "0.8.0";
  pname = "python-rapidjson";
  disabled = pythonOlder "3.4";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0z8wzl5mjzs97y7sbhlm59kak3z377xln3z8lkjwrsh2sh5c9x3v";
+    sha256 = "13fgy5bqslx913p9gachj9djk3g6wx1igwaccfnxjl2msrbwclwp";
  };

  LC_ALL="en_US.utf-8";
--- a/pkgs/development/python-modules/pythonnet/default.nix
+++ b/pkgs/development/python-modules/pythonnet/default.nix
@@ -80,5 +80,6 @@ buildPythonPackage rec {
    homepage = https://pythonnet.github.io;
    license = licenses.mit;
    maintainers = with maintainers; [ jraygauthier ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/pytorch/default.nix
+++ b/pkgs/development/python-modules/pytorch/default.nix
@@ -2,7 +2,7 @@
  cudaSupport ? false, cudatoolkit ? null, cudnn ? null,
  fetchFromGitHub, lib, numpy, pyyaml, cffi, typing, cmake, hypothesis, numactl,
  linkFarm, symlinkJoin,
-  utillinux, which }:
+  utillinux, which, isPy3k }:

 assert cudnn == null || cudatoolkit != null;
 assert !cudaSupport || cudatoolkit != null;
@@ -27,6 +27,7 @@ let
 in buildPythonPackage rec {
  version = "1.0.0";
  pname = "pytorch";
+  disabled = !isPy3k;

  src = fetchFromGitHub {
    owner  = "pytorch";
--- a/pkgs/development/python-modules/qscintilla-qt5/default.nix
+++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix
@@ -45,5 +45,6 @@ buildPythonPackage {
    license = licenses.lgpl21Plus;
    maintainers = with maintainers; [ lsix ];
    homepage = https://www.riverbankcomputing.com/software/qscintilla/;
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/qutip/default.nix
+++ b/pkgs/development/python-modules/qutip/default.nix
@@ -39,6 +39,7 @@ buildPythonPackage rec {
    '';
    homepage = http://qutip.org/;
    license = licenses.bsd0;
+    broken = true;
  };

 }
--- a/pkgs/development/python-modules/ropper/default.nix
+++ b/pkgs/development/python-modules/ropper/default.nix
@@ -8,11 +8,11 @@

 buildPythonApplication rec {
  pname = "ropper";
-  version = "1.12.1";
+  version = "1.12.5";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1aignpxz6rcbf6yxy1gjr708p56i6nqrbgblq24nanssz9rhkyzg";
+    sha256 = "063lki438nsaylgqr5s785j6rbfqnyzb5bxnr8ixhmpk5irf3sqd";
  };
  # XXX tests rely on user-writeable /dev/shm to obtain process locks and return PermissionError otherwise
  # workaround: sudo chmod 777 /dev/shm
--- a/pkgs/development/python-modules/rubymarshal/default.nix
+++ b/pkgs/development/python-modules/rubymarshal/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, buildPythonPackage, fetchPypi, hypothesis }:
+{ stdenv, buildPythonPackage, fetchPypi, hypothesis, isPy3k }:

 buildPythonPackage rec {
  pname = "rubymarshal";
  version = "1.2.6";
+  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/slither-analyzer/default.nix
+++ b/pkgs/development/python-modules/slither-analyzer/default.nix
@@ -1,4 +1,8 @@
-{ lib, buildPythonPackage, fetchPypi, makeWrapper, prettytable, pythonOlder, solc }:
+{ lib, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder
+, prettytable
+, setuptools
+, solc
+}:

 buildPythonPackage rec {
  pname = "slither-analyzer";
@@ -15,7 +19,7 @@ buildPythonPackage rec {
  };

  nativeBuildInputs = [ makeWrapper ];
-  propagatedBuildInputs = [ prettytable ];
+  propagatedBuildInputs = [ prettytable setuptools ];

  postFixup = ''
    wrapProgram $out/bin/slither \
--- a/pkgs/development/python-modules/snug/default.nix
+++ b/pkgs/development/python-modules/snug/default.nix
@@ -1,11 +1,13 @@
 { buildPythonPackage, lib, fetchFromGitHub, glibcLocales
 , pytest, pytest-mock, gentools
 , typing, singledispatch, pythonOlder
+, isPy3k
 }:

 buildPythonPackage rec {
  pname = "snug";
  version = "1.3.4";
+  disabled = isPy3k;

  # Pypi doesn't ship the tests, so we fetch directly from GitHub
  src = fetchFromGitHub {
--- a/pkgs/development/python-modules/sparse/default.nix
+++ b/pkgs/development/python-modules/sparse/default.nix
@@ -35,5 +35,6 @@ buildPythonPackage rec {
    homepage = https://github.com/pydata/sparse/;
    license = licenses.bsd3;
    maintainers = [ maintainers.costrouc ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/spectral-cube/default.nix
+++ b/pkgs/development/python-modules/spectral-cube/default.nix
@@ -40,6 +40,7 @@ buildPythonPackage rec {
    license = lib.licenses.bsd3;
    platforms = lib.platforms.all;
    maintainers = with lib.maintainers; [ smaret ];
+    broken = true;
  };
 }

--- a/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
+++ b/pkgs/development/python-modules/sphinxcontrib_plantuml/default.nix
@@ -7,11 +7,11 @@

 buildPythonPackage rec {
  pname = "sphinxcontrib-plantuml";
-  version = "0.17";
+  version = "0.17.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1e388ea0c8bc933adecf438f5243857ca238050a107d2768e5ffb490bbb733d7";
+    sha256 = "1amvczdin078ia1ax2379lklxr0bwjsrin96174dvssxpzjl04cc";
  };

  # No tests included.
--- a/pkgs/development/python-modules/sqlobject/default.nix
+++ b/pkgs/development/python-modules/sqlobject/default.nix
@@ -10,11 +10,11 @@

 buildPythonPackage rec {
  pname = "SQLObject";
-  version = "3.7.2";
+  version = "3.7.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "8aee27279231bae59e95b299e253b27ac2d78934989f4ccbe317c7b25faab6de";
+    sha256 = "0dgzmzdv3alfdqcrl4x0xf9161ls80h33rnqbz0yhmfpkjg99b9n";
  };

  checkInputs = [ pytest ];
--- a/pkgs/development/python-modules/ssdp/default.nix
+++ b/pkgs/development/python-modules/ssdp/default.nix
@@ -4,11 +4,13 @@
 , isPy27
 , pbr
 , pytest
+, isPy3k
 }:

 buildPythonPackage rec {
  pname = "ssdp";
  version = "1.0.1";
+  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/starlette/default.nix
+++ b/pkgs/development/python-modules/starlette/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , aiofiles
@@ -12,16 +13,17 @@
 , python
 , uvicorn
 , isPy27
+, darwin
 }:

 buildPythonPackage rec {
  pname = "starlette";
-  version = "0.12.4";
+  version = "0.12.7";
  disabled = isPy27;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1m7qf4g5dn7n36406zbqsag71nmwp2dz91yxpplm7h7wiw2xxw93";
+    sha256 = "0zf7nwma801a9hvwwq4xy3rrkca9vydj30s3bnngmm4dvkk575c4";
  };

  propagatedBuildInputs = [
@@ -33,7 +35,7 @@ buildPythonPackage rec {
    requests
    ujson
    uvicorn
-  ];
+  ] ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.ApplicationServices ];

  checkPhase = ''
    ${python.interpreter} -c """
--- a/pkgs/development/python-modules/strictyaml/default.nix
+++ b/pkgs/development/python-modules/strictyaml/default.nix
@@ -6,12 +6,12 @@
 }:

 buildPythonPackage rec {
-  version = "1.0.1";
+  version = "1.0.3";
  pname = "strictyaml";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1baz5zjl1z9dwaczaga1ik1iy1v9zg3acwnpmgghwnk9hw2i1mq6";
+    sha256 = "05masza4jvvnh2msswpx4l29w1pv92zpy473yd2ndwcclcrk3rli";
  };

  propagatedBuildInputs = [ ruamel_yaml python-dateutil ];
--- a/pkgs/development/python-modules/swagger-spec-validator/default.nix
+++ b/pkgs/development/python-modules/swagger-spec-validator/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock }:
+{ lib, buildPythonPackage, fetchFromGitHub, pyyaml, jsonschema, six, pytest, mock, isPy3k }:

 buildPythonPackage rec {
  pname = "swagger-spec-validator";
--- a/pkgs/development/python-modules/symengine/default.nix
+++ b/pkgs/development/python-modules/symengine/default.nix
@@ -48,5 +48,6 @@ buildPythonPackage rec {
    homepage = https://github.com/symengine/symengine.py;
    license = licenses.mit;
    maintainers = [ maintainers.costrouc ];
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/tomlkit/default.nix
+++ b/pkgs/development/python-modules/tomlkit/default.nix
@@ -4,11 +4,11 @@

 buildPythonPackage rec {
  pname = "tomlkit";
-  version = "0.5.5";
+  version = "0.5.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0xlmx280mzd3f63ydqhr76whbr2lhcwihyg9my9d5hjklkrhdn58";
+    sha256 = "18820ga5z3if1w8dvykxrfm000akracq01ic402xrbljgbn5grn4";
  };

  propagatedBuildInputs =
--- a/pkgs/development/python-modules/txtorcon/default.nix
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -4,7 +4,7 @@

 buildPythonPackage rec {
  pname = "txtorcon";
-  version = "19.0.0";
+  version = "19.1.0";

  checkInputs = [ pytest mock lsof GeoIP ];
  propagatedBuildInputs = [
@@ -15,7 +15,7 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0fxzhsc62bhmr730vj9pzallmw56gz6iykvl28a5agrycm0bfc9p";
+    sha256 = "19ayn5w9ayxbb1m84l1s9qlb6kv7sz6sg34mzy8bnidc7qnfbn15";
  };

  # Skip a failing test until fixed upstream:
--- a/pkgs/development/python-modules/vmprof/default.nix
+++ b/pkgs/development/python-modules/vmprof/default.nix
@@ -23,6 +23,7 @@ buildPythonPackage rec {
    description = "A vmprof client";
    license = licenses.mit;
    homepage = https://vmprof.readthedocs.org/;
+    broken = true;
  };

 }
--- a/pkgs/development/python-modules/voluptuous-serialize/default.nix
+++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix
@@ -2,13 +2,13 @@

 buildPythonPackage rec  {
  pname = "voluptuous-serialize";
-  version = "2.2.0";
+  version = "2.3.0";

  disabled = !isPy3k;

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0ggiisrq7cbk307d09fdwfdcjb667jv90lx6gfwhxfpxgq66cccb";
+    sha256 = "1xcjyp1190z6a226fg0clvhf43gjsbyn60amblsg7w7cw86d033l";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/word2vec/default.nix
+++ b/pkgs/development/python-modules/word2vec/default.nix
@@ -27,6 +27,7 @@ buildPythonPackage rec {
    homepage = "https://github.com/danielfrg/word2vec";
    license     = licenses.asl20;
    maintainers = with maintainers; [ NikolaMandic ];
+    broken = true;
  };

 }
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -6,13 +6,13 @@

 buildPythonPackage rec {
  pname = "xdis";
-  version = "4.0.3";
+  version = "4.0.4";

  src = fetchFromGitHub {
    owner = "rocky";
    repo = "python-xdis";
    rev = version;
-    sha256 = "1h4j8hincf49zyd0rvn4bh0ypj8836y8vz3d496ycb9gjzkr6044";
+    sha256 = "1m54d61ka9wgq0iqlzmsikzxa6qmwvnwsgm2kxb3vw5ic1psv4pv";
  };

  checkInputs = [ pytest ];
--- a/pkgs/development/python-modules/yt/default.nix
+++ b/pkgs/development/python-modules/yt/default.nix
@@ -10,11 +10,13 @@
 , nose
 , cython
 , python
+, isPy3k
 }:

 buildPythonPackage rec {
  pname = "yt";
  version = "3.5.1";
+  disabled = isPy3k;

  src = fetchPypi {
    inherit pname version;
--- a/pkgs/development/python-modules/zake/default.nix
+++ b/pkgs/development/python-modules/zake/default.nix
@@ -30,6 +30,7 @@ buildPythonPackage rec {
    homepage = "https://github.com/yahoo/Zake";
    description = "A python package that works to provide a nice set of testing utilities for the kazoo library";
    license = licenses.asl20;
+    broken = true;
  };

 }
--- a/pkgs/development/python-modules/zope_contenttype/default.nix
+++ b/pkgs/development/python-modules/zope_contenttype/default.nix
@@ -17,6 +17,7 @@ buildPythonPackage rec {
    description = "A utility module for content-type (MIME type) handling";
    license = licenses.zpl20;
    maintainers = with maintainers; [ goibhniu ];
+    broken = true;
  };

 }
--- a/pkgs/development/python-modules/zope_i18n/default.nix
+++ b/pkgs/development/python-modules/zope_i18n/default.nix
@@ -21,6 +21,7 @@ buildPythonPackage rec {
    description = "Zope Internationalization Support";
    license = licenses.zpl20;
    maintainers = with maintainers; [ goibhniu ];
+    broken = true;
  };

 }