From af32623d043a635fba54dafa67349ec1796d23b3 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Sun, 7 Jan 2018 21:28:57 -0400
Subject: [PATCH 001/104] mesa: set sysconfdir to /run/opengl-driver/etc

This allows drirc to be found.
---
 pkgs/development/libraries/mesa/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index e1fe061a9651..d343bd1112d0 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation {
 
   # TODO: Figure out how to enable opencl without having a runtime dependency on clang
   configureFlags = [
-    "--sysconfdir=/etc"
+    "--sysconfdir=${driverLink}/etc"
     "--localstatedir=/var"
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-dri-searchpath=${driverLink}/lib/dri"
@@ -197,7 +197,6 @@ stdenv.mkDerivation {
   '';
 
   # TODO:
-  #  @vcunat isn't sure if drirc will be found when in $out/etc/;
   #  check $out doesn't depend on llvm: builder failures are ignored
   #  for some reason grep -qv '${llvmPackages.llvm}' -R "$out";
   postFixup = ''

From 11396f8735648982cdefc427f26c57f77cbb8e17 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 13:27:09 +1000
Subject: [PATCH 002/104] pythonPackages.rdflib: 4.1.2 -> 4.2.2

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 125d89fe800c..aa401e67972e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15622,11 +15622,11 @@ in {
 
 
   rdflib = buildPythonPackage (rec {
-    name = "rdflib-4.1.2";
+    name = "rdflib-4.2.2";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/r/rdflib/${name}.tar.gz";
-      sha256 = "0kvaf332cqbi47rqzlpdx4mbkvw12mkrzkj8n9l19wk713d4py9w";
+      sha256 = "0398c714znnhaa2x7v51b269hk20iz073knq2mvmqp2ma92z27fs";
     };
 
     # error: invalid command 'test'

From b370e63babfa8e59a947d2866001b4e989d6b778 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 13:28:17 +1000
Subject: [PATCH 003/104] pythonPackages.traits: 4.5.0 -> 4.6.0

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aa401e67972e..45631159231d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17850,11 +17850,11 @@ in {
 
   traits = buildPythonPackage rec {
     name = "traits-${version}";
-    version = "4.5.0";
+    version = "4.6.0";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/t/traits/${name}.tar.gz";
-      sha256 = "5293a8786030b0b243e059f52004355b6939d7c0f1be2eb5a605b63cca484c84";
+      sha256 = "0w43qv36wnrimlh0nzzgg81315a18yza3vk494wqxf1l19g390jx";
     };
 
     # Use pytest because its easier to discover tests
@@ -17867,7 +17867,7 @@ in {
     # https://github.com/enthought/traits/issues/187
     # https://github.com/enthought/traits/pull/188
     # Furthermore, some tests fail due to being in a chroot
-    doCheck = false;
+    doCheck = isPy33;
 
     propagatedBuildInputs = with self; [ numpy ];
 

From 0a4e6ca222e2d5ed78c35f60d89c912ab0ad0bb2 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 13:28:42 +1000
Subject: [PATCH 004/104] pythonPackages.xvfbwrapper: init at 0.2.9

---
 .../python-modules/xvfbwrapper/default.nix    | 24 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/xvfbwrapper/default.nix

diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix
new file mode 100644
index 000000000000..4a26267fa80e
--- /dev/null
+++ b/pkgs/development/python-modules/xvfbwrapper/default.nix
@@ -0,0 +1,24 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, xorgserver
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "xvfbwrapper";
+  version = "0.2.9";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "097wxhvp01ikqpg1z3v8rqhss6f1vwr399zpz9a05d2135bsxx5w";
+  };
+  propagatedBuildInputs = [ xorgserver ];
+
+  meta = with stdenv.lib; {
+    description = "Run headless display inside X virtual framebuffer (Xvfb)";
+    homepage = https://github.com/cgoldberg/xvfbwrapper;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ashgillman ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 45631159231d..3248b7e351d9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21675,6 +21675,10 @@ EOF
     };
   };
 
+  xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper {
+    inherit (pkgs.xorg) xorgserver;
+  };
+
   hidapi = callPackage ../development/python-modules/hidapi {
     inherit (pkgs) udev libusb1;
   };

From 0b47691400befd31e4d20345b4259c0bef0ebc77 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 13:29:17 +1000
Subject: [PATCH 005/104] pythonPackages.nibabel: 2.0.2 -> 2.2.0

---
 pkgs/top-level/python-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3248b7e351d9..02ae205b708e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11331,17 +11331,18 @@ in {
   });
 
   nibabel = buildPythonPackage rec {
-    version = "2.0.2";
+    version = "2.2.0";
     name = "nibabel-${version}";
 
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/nibabel/${name}.tar.gz";
-      sha256 = "0k8mv5zmwb6vc8kwrydl3pp0pnw937rf5mz10figkxczrw6dkk7h";
+      sha256 = "1h6nhi1s2ab7sdyyl3qjnvlw0kggcnam7vn4b3z56ay20596kvhw";
     };
 
     propagatedBuildInputs = with self; [
       numpy
       nose
+      six
     ];
 
     # Failing tests

From 0a87eee6a04fb484888cc70e1d17999559d0fb8e Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 13:29:42 +1000
Subject: [PATCH 006/104] pythonPackages.pydotplus: init at 2.0.2

---
 .../python-modules/pydotplus/default.nix      | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/python-modules/pydotplus/default.nix

diff --git a/pkgs/development/python-modules/pydotplus/default.nix b/pkgs/development/python-modules/pydotplus/default.nix
new file mode 100644
index 000000000000..db924e489985
--- /dev/null
+++ b/pkgs/development/python-modules/pydotplus/default.nix
@@ -0,0 +1,27 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, pyparsing
+, graphviz
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "pydotplus";
+  version = "2.0.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1i05cnk3yh722fdyaq0asr7z9xf7v7ikbmnpxa8j6pdqx6g5xs4i";
+  };
+
+  propagatedBuildInputs = [
+    pyparsing
+    graphviz
+  ];
+
+  meta = {
+    homepage = https://code.google.com/p/pydot/;
+    description = "An improved version of the old pydot project that provides a Python Interface to Graphviz’s Dot language";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 02ae205b708e..ce3a38e80fc1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6271,6 +6271,8 @@ in {
     inherit (pkgs.stdenv) mkDerivation;
   };
 
+  pydotplus = callPackage ../development/python-modules/pydotplus { };
+
   pyphen = callPackage ../development/python-modules/pyphen {};
 
   pypoppler = buildPythonPackage rec {

From 15138ba1f68a1a1e063ccc59f00789175a2b9c65 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 13:30:03 +1000
Subject: [PATCH 007/104] pythonPackages.prov: init at 1.5.0

---
 .../python-modules/prov/default.nix           | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/prov/default.nix

diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix
new file mode 100644
index 000000000000..4ce40f92fb86
--- /dev/null
+++ b/pkgs/development/python-modules/prov/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, lxml
+, networkx
+, dateutil
+, six
+, pydotplus
+, rdflib
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "prov";
+  version = "1.5.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1vkpayns0mf7i2357vxyvi2n5h5xsyg56ik2yqgrc91k3gx4x9wn";
+  };
+
+  propagatedBuildInputs = [
+    lxml
+    networkx
+    dateutil
+    six
+    pydotplus
+    rdflib
+  ];
+  doCheck = false; # takes forever!
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ce3a38e80fc1..1895795133f8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6174,6 +6174,8 @@ in {
     };
   };
 
+  prov = callPackage ../development/python-modules/prov { };
+
   pudb = buildPythonPackage rec {
     name = "pudb-2016.2";
 

From 1832571dc6a24eb5722cf27b50a483aef9b28eaa Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 13:31:20 +1000
Subject: [PATCH 008/104] pythonPackages.nipype: 0.10.0 -> 0.14.0

---
 pkgs/top-level/python-packages.nix | 40 ++++++++++++++++++------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1895795133f8..bf0665a8e339 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11409,34 +11409,42 @@ in {
   };
 
   nipype = buildPythonPackage rec {
-    version = "0.10.0";
+    version = "0.14.0";
     name = "nipype-${version}";
 
-    # Uses python 2 print. Master seems to be Py3 compatible.
-    disabled = isPy3k;
-
     src = pkgs.fetchurl {
       url = "mirror://pypi/n/nipype/${name}.tar.gz";
-      sha256 = "7fb143cd4d05f18db1cb7f0b83dba13d3dcf55b4eb3d16df08c97033ccae507b";
+      sha256 = "0airdrh93vwmbfkqxp5cqfzm0zzqcvjnvphv3zhg197y39xxpl1k";
     };
 
-    # Tests fail due to getcwd returning ENOENT???
-    doCheck = false;
-
+    doCheck = false; # fails with TypeError: None is not callable
+    checkInputs = [ pkgs.which ];
+    buildInputs = with self; [ pytest mock ];
     propagatedBuildInputs = with self; [
-     numpy
-     dateutil
-     nose
-     traits
-     scipy
-     nibabel
-     networkx
-   ];
+      click
+      dateutil
+      funcsigs
+      future
+      networkx
+      nibabel
+      numpy
+      packaging
+      prov
+      psutil
+      pydot
+      scipy
+      simplejson
+      traits
+      xvfbwrapper
+    ] ++ stdenv.lib.optional (!isPy3k) [
+      configparser
+    ];
 
     meta = {
       homepage = http://nipy.org/nipype/;
       description = "Neuroimaging in Python: Pipelines and Interfaces";
       license = licenses.bsd3;
+      maintainers = with maintainers; [ ashgillman ];
     };
   };
 

From c1eeedaf4a52288f65c002966b2a1a6e002a9ee5 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <gillmanash@gmail.com>
Date: Tue, 16 Jan 2018 23:29:42 +1000
Subject: [PATCH 009/104] pythonPackages.nipype: To separate file.

---
 .../python-modules/nipype/default.nix         | 69 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 40 +----------
 2 files changed, 71 insertions(+), 38 deletions(-)
 create mode 100644 pkgs/development/python-modules/nipype/default.nix

diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
new file mode 100644
index 000000000000..c5174d7f94dd
--- /dev/null
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -0,0 +1,69 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+# python dependencies
+, click
+, configparser ? null
+, dateutil
+, funcsigs
+, future
+, mock
+, networkx
+, nibabel
+, numpy
+, packaging
+, prov
+, psutil
+, pydot
+, pytest
+, scipy
+, simplejson
+, traits
+, xvfbwrapper
+# other dependencies
+, which
+}:
+
+assert !isPy3k -> configparser != null;
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "nipype";
+  version = "0.14.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0airdrh93vwmbfkqxp5cqfzm0zzqcvjnvphv3zhg197y39xxpl1k";
+  };
+
+  doCheck = false;  # fails with TypeError: None is not callable
+  checkInputs = [ which ];
+  buildInputs = [ pytest mock ];  # required in installPhase
+  propagatedBuildInputs = [
+    click
+    dateutil
+    funcsigs
+    future
+    networkx
+    nibabel
+    numpy
+    packaging
+    prov
+    psutil
+    pydot
+    scipy
+    simplejson
+    traits
+    xvfbwrapper
+  ] ++ stdenv.lib.optional (!isPy3k) [
+    configparser
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = http://nipy.org/nipype/;
+    description = "Neuroimaging in Python: Pipelines and Interfaces";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ ashgillman ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf0665a8e339..7687f735bee4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11408,44 +11408,8 @@ in {
     };
   };
 
-  nipype = buildPythonPackage rec {
-    version = "0.14.0";
-    name = "nipype-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/nipype/${name}.tar.gz";
-      sha256 = "0airdrh93vwmbfkqxp5cqfzm0zzqcvjnvphv3zhg197y39xxpl1k";
-    };
-
-    doCheck = false; # fails with TypeError: None is not callable
-    checkInputs = [ pkgs.which ];
-    buildInputs = with self; [ pytest mock ];
-    propagatedBuildInputs = with self; [
-      click
-      dateutil
-      funcsigs
-      future
-      networkx
-      nibabel
-      numpy
-      packaging
-      prov
-      psutil
-      pydot
-      scipy
-      simplejson
-      traits
-      xvfbwrapper
-    ] ++ stdenv.lib.optional (!isPy3k) [
-      configparser
-    ];
-
-    meta = {
-      homepage = http://nipy.org/nipype/;
-      description = "Neuroimaging in Python: Pipelines and Interfaces";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ ashgillman ];
-    };
+  nipype = callPackage ../development/python-modules/nipype {
+    inherit (pkgs) which;
   };
 
   nose = buildPythonPackage rec {

From 0b88cba5641519fd97b594cfbf327234d48689a2 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 19:31:18 +1000
Subject: [PATCH 010/104] pythonPackages.prov: Add meta

---
 pkgs/development/python-modules/prov/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix
index 4ce40f92fb86..ce9a3e7d56cd 100644
--- a/pkgs/development/python-modules/prov/default.nix
+++ b/pkgs/development/python-modules/prov/default.nix
@@ -28,4 +28,11 @@ buildPythonPackage rec {
     rdflib
   ];
   doCheck = false; # takes forever!
+
+  meta = with stdenv.lib; {
+    description = "A Python library for W3C Provenance Data Model (PROV)";
+    homepage = https://github.com/trungdong/prov;
+    license = licenses.mit;
+    maintainers = with maintainers; [ ashgillman ];
+  };
 }

From cb1e6fe9920f32b6fb99ac7d0fc467039207af75 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Tue, 16 Jan 2018 19:31:37 +1000
Subject: [PATCH 011/104] pythonPackages.pydotplus: Update homepage, add
 license and maintainers.

---
 pkgs/development/python-modules/pydotplus/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydotplus/default.nix b/pkgs/development/python-modules/pydotplus/default.nix
index db924e489985..0640374fa656 100644
--- a/pkgs/development/python-modules/pydotplus/default.nix
+++ b/pkgs/development/python-modules/pydotplus/default.nix
@@ -20,8 +20,10 @@ buildPythonPackage rec {
     graphviz
   ];
 
-  meta = {
-    homepage = https://code.google.com/p/pydot/;
+  meta = with stdenv.lib; {
+    homepage = https://github.com/erocarrera/pydot;
     description = "An improved version of the old pydot project that provides a Python Interface to Graphviz’s Dot language";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ashgillman ];
   };
 }

From 655c9450f62215ef1a251c60bbc73a72dbe2a3e8 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <gillmanash@gmail.com>
Date: Tue, 16 Jan 2018 23:28:55 +1000
Subject: [PATCH 012/104] pythonPackages.nibabel: Move to separate file.

---
 .../python-modules/nibabel/default.nix        | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 27 +-------------
 2 files changed, 38 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/python-modules/nibabel/default.nix

diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
new file mode 100644
index 000000000000..5aba6ffd71ec
--- /dev/null
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -0,0 +1,37 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, numpy
+, nose
+, six
+}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "nibabel";
+  version = "2.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1h6nhi1s2ab7sdyyl3qjnvlw0kggcnam7vn4b3z56ay20596kvhw";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    nose
+    six
+  ];
+
+  # Failing tests
+  # nibabel.tests.test_minc1.test_old_namespace
+  # nibabel.gifti.tests.test_parse_gifti_fast.test_parse_dataarrays
+  # nibabel.gifti.tests.test_giftiio.test_read_deprecated
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = http://nipy.org/nibabel/;
+    description = "Access a multitude of neuroimaging data formats";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ashgillman ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7687f735bee4..be92851919c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11334,32 +11334,7 @@ in {
     };
   });
 
-  nibabel = buildPythonPackage rec {
-    version = "2.2.0";
-    name = "nibabel-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/n/nibabel/${name}.tar.gz";
-      sha256 = "1h6nhi1s2ab7sdyyl3qjnvlw0kggcnam7vn4b3z56ay20596kvhw";
-    };
-
-    propagatedBuildInputs = with self; [
-      numpy
-      nose
-      six
-    ];
-
-    # Failing tests
-    # nibabel.tests.test_minc1.test_old_namespace
-    # nisext.tests.test_testers.test_back_tick
-    doCheck = false;
-
-    meta = {
-      homepage = http://nipy.org/nibabel/;
-      description = "Access a multitude of neuroimaging data formats";
-      license = licenses.mit;
-    };
-  };
+  nibabel = callPackage ../development/python-modules/nibabel {};
 
   nilearn = callPackage ../development/python-modules/nilearn {};
 

From 100bf5ae98a0c3031008bd646ef1951d870ae449 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Wed, 17 Jan 2018 10:04:14 +1000
Subject: [PATCH 013/104] 
 pythonPackages.{nibabel,nipype,prov,pydotplus,xvfbwrapper}: Remove name

---
 pkgs/development/python-modules/nibabel/default.nix     | 1 -
 pkgs/development/python-modules/nipype/default.nix      | 1 -
 pkgs/development/python-modules/prov/default.nix        | 1 -
 pkgs/development/python-modules/pydotplus/default.nix   | 1 -
 pkgs/development/python-modules/xvfbwrapper/default.nix | 1 -
 5 files changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix
index 5aba6ffd71ec..7db4378a6e63 100644
--- a/pkgs/development/python-modules/nibabel/default.nix
+++ b/pkgs/development/python-modules/nibabel/default.nix
@@ -7,7 +7,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "nibabel";
   version = "2.2.0";
 
diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix
index c5174d7f94dd..8ee6eeb104b4 100644
--- a/pkgs/development/python-modules/nipype/default.nix
+++ b/pkgs/development/python-modules/nipype/default.nix
@@ -28,7 +28,6 @@
 assert !isPy3k -> configparser != null;
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "nipype";
   version = "0.14.0";
 
diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix
index ce9a3e7d56cd..f80a3a1babfe 100644
--- a/pkgs/development/python-modules/prov/default.nix
+++ b/pkgs/development/python-modules/prov/default.nix
@@ -10,7 +10,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "prov";
   version = "1.5.0";
 
diff --git a/pkgs/development/python-modules/pydotplus/default.nix b/pkgs/development/python-modules/pydotplus/default.nix
index 0640374fa656..03b594a131a0 100644
--- a/pkgs/development/python-modules/pydotplus/default.nix
+++ b/pkgs/development/python-modules/pydotplus/default.nix
@@ -6,7 +6,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "pydotplus";
   version = "2.0.2";
 
diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix
index 4a26267fa80e..0758baacff8a 100644
--- a/pkgs/development/python-modules/xvfbwrapper/default.nix
+++ b/pkgs/development/python-modules/xvfbwrapper/default.nix
@@ -5,7 +5,6 @@
 }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "xvfbwrapper";
   version = "0.2.9";
 

From 497e5183e5405b7aa9b1f6700d1552a9f47976d9 Mon Sep 17 00:00:00 2001
From: Ashley Gillman <ashley.gillman@csiro.au>
Date: Wed, 17 Jan 2018 10:13:34 +1000
Subject: [PATCH 014/104] pythonPackages.prov: More descriptive reason for
 skipping check phase

---
 pkgs/development/python-modules/prov/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix
index f80a3a1babfe..bf4b38aa146b 100644
--- a/pkgs/development/python-modules/prov/default.nix
+++ b/pkgs/development/python-modules/prov/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     pydotplus
     rdflib
   ];
-  doCheck = false; # takes forever!
+  doCheck = false; # takes ~60 mins
 
   meta = with stdenv.lib; {
     description = "A Python library for W3C Provenance Data Model (PROV)";

From fa8eb1cb46aea4231df528d6b0f1d6dea90240c9 Mon Sep 17 00:00:00 2001
From: Valentin Heidelberger <github@valentinsblog.com>
Date: Wed, 17 Jan 2018 16:40:10 +0100
Subject: [PATCH 015/104] hypothesis: 3.11.1 -> 3.27.0

---
 .../python-modules/hypothesis/default.nix            | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix
index ab56cde9c131..91939d146887 100644
--- a/pkgs/development/python-modules/hypothesis/default.nix
+++ b/pkgs/development/python-modules/hypothesis/default.nix
@@ -1,6 +1,6 @@
 { stdenv, buildPythonPackage, fetchFromGitHub, python
 , pythonOlder, pythonAtLeast, enum34
-, doCheck ? true, pytest, pytest_xdist, flake8, flaky
+, doCheck ? true, pytest, pytest_xdist, flake8, flaky, mock
 }:
 buildPythonPackage rec {
   # http://hypothesis.readthedocs.org/en/latest/packaging.html
@@ -9,7 +9,7 @@ buildPythonPackage rec {
   # pytz fake_factory django numpy pytest
   # If you need these, you can just add them to your environment.
 
-  version = "3.11.1";
+  version = "3.27.0";
   pname = "hypothesis";
   name = "${pname}-${version}";
 
@@ -18,10 +18,10 @@ buildPythonPackage rec {
     owner = "HypothesisWorks";
     repo = "hypothesis-python";
     rev = "${version}";
-    sha256 = "0damf6zbm0db2a3gfwrbbj92yal576wpmhhchc0w0np8vdnax70n";
-  };
+    sha256 = "1lvhd8jrwajyc5w1alb9vinsi97fjfqpkxkh8g8j527831lig0j0";
+ };
 
-  checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky ];
+  checkInputs = stdenv.lib.optionals doCheck [ pytest pytest_xdist flake8 flaky mock];
   propagatedBuildInputs = stdenv.lib.optionals (pythonOlder "3.4") [ enum34 ];
 
   inherit doCheck;
@@ -38,7 +38,7 @@ buildPythonPackage rec {
 
   meta = with stdenv.lib; {
     description = "A Python library for property based testing";
-    homepage = https://github.com/DRMacIver/hypothesis;
+    homepage = https://github.com/HypothesisWorks/hypothesis;
     license = licenses.mpl20;
   };
 }

From 6c5149f51ab867c7e7cfcadd1706a3c8085d81ea Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:46:08 +0100
Subject: [PATCH 016/104] python.pkgs.crayons: init at 0.1.2

---
 .../python-modules/crayons/default.nix        | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/python-modules/crayons/default.nix

diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix
new file mode 100644
index 000000000000..16b3998eb856
--- /dev/null
+++ b/pkgs/development/python-modules/crayons/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage, colorama }:
+
+buildPythonPackage rec {
+  pname = "crayons";
+  version = "0.1.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "17c0v0dkk8sn8kyyy2w7myxq9981glrbczh6h8sdcr750lb6j5sy";
+  };
+
+  propagatedBuildInputs = [ colorama ];
+
+  meta = with stdenv.lib; {
+    description = "TextUI colors for Python";
+    homepage = https://github.com/kennethreitz/crayons;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be92851919c0..501041346972 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7153,6 +7153,8 @@ in {
 
   chardet = callPackage ../development/python-modules/chardet { };
 
+  crayons = callPackage ../development/python-modules/crayons{ };
+
   django = self.django_1_11;
 
   django_1_11 = callPackage ../development/python-modules/django/1_11.nix {

From efb915e0204244c27bb774828c59823987a69c8c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:48:55 +0100
Subject: [PATCH 017/104] python.pkgs.flask-common: init at 0.2.0

---
 .../python-modules/flask-common/default.nix   | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-common/default.nix

diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix
new file mode 100644
index 000000000000..31fe2a677c39
--- /dev/null
+++ b/pkgs/development/python-modules/flask-common/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchPypi, buildPythonPackage
+, crayons, flask, flask_cache, gunicorn, maya, meinheld, whitenoise }:
+
+buildPythonPackage rec {
+  pname = "Flask-Common";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1f6ibvkxpxgczxs4qcbh5bj8rf9ggggbagi2dkaphx5w29xbbys4";
+  };
+
+  propagatedBuildInputs = [ crayons flask flask_cache gunicorn maya meinheld whitenoise ];
+
+  meta = with stdenv.lib; {
+    description = "Flask extension with lots of common time-savers";
+    homepage = https://github.com/kennethreitz/flask-common;
+    license = licenses.asl20; # XXX: setup.py lists BSD but git repo has Apache 2.0 LICENSE
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 501041346972..5745a19e289b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8045,6 +8045,8 @@ in {
     };
   };
 
+  flask-common = callPackage ../development/python-modules/flask-common { };
+
   flask-compress = callPackage ../development/python-modules/flask-compress { };
 
   flask-cors = callPackage ../development/python-modules/flask-cors { };

From 92e535d3f16c0f94d48689e4322bf38b8ab52b21 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:49:15 +0100
Subject: [PATCH 018/104] python.pkgs.flask-limiter: init at 1.0.1

---
 .../python-modules/flask-limiter/default.nix  | 19 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-limiter/default.nix

diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix
new file mode 100644
index 000000000000..a60c5a993ea3
--- /dev/null
+++ b/pkgs/development/python-modules/flask-limiter/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchPypi, buildPythonPackage, flask, limits }:
+
+buildPythonPackage rec {
+  pname = "Flask-Limiter";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1f0diannnc6rc0ngsh222lws3qf89wxm0aschaxxvwjvybf9iklc";
+  };
+
+  propagatedBuildInputs = [ flask limits ];
+
+  meta = with stdenv.lib; {
+    description = "Rate limiting for flask applications";
+    homepage = https://flask-limiter.readthedocs.org/;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5745a19e289b..3a51f1b1d8f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8053,6 +8053,8 @@ in {
 
   flask_elastic = callPackage ../development/python-modules/flask-elastic { };
 
+  flask-limiter = callPackage ../development/python-modules/flask-limiter { };
+
   flask_login = callPackage ../development/python-modules/flask-login { };
 
   flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { };

From 12ff86038039a370059d612ef090b246d341622d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:49:34 +0100
Subject: [PATCH 019/104] python.pkgs.limits: init at 1.2.1

---
 .../python-modules/limits/default.nix         | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/python-modules/limits/default.nix

diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix
new file mode 100644
index 000000000000..672cad5bfe17
--- /dev/null
+++ b/pkgs/development/python-modules/limits/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchPypi, buildPythonPackage, six }:
+
+buildPythonPackage rec {
+  pname = "limits";
+  version = "1.2.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0dfbrmqixsvhvzqgd4s8rfj933k1w5q4bm23pp9zyp70xlb0mfmd";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  doCheck = false; # ifilter
+
+  meta = with stdenv.lib; {
+    description = "Rate limiting utilities";
+    license = licenses.mit;
+    homepage = https://limits.readthedocs.org/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3a51f1b1d8f1..58b11a9b33a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9841,6 +9841,8 @@ in {
   libxslt = disabledIf isPy3k
     (toPythonModule (pkgs.libxslt.override{pythonSupport=true; python2=python; inherit (self) libxml2;})).py;
 
+  limits = callPackage ../development/python-modules/limits { };
+
   limnoria = buildPythonPackage rec {
     name = "limnoria-${version}";
     version = "2016.05.06";

From 642788bd852252748dda8ad27b6ac887041370e2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:49:57 +0100
Subject: [PATCH 020/104] python.pkgs.maya: init at 0.3.3

---
 .../python-modules/maya/default.nix           | 32 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/maya/default.nix

diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix
new file mode 100644
index 000000000000..9c6cb241fea5
--- /dev/null
+++ b/pkgs/development/python-modules/maya/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchPypi, fetchpatch, buildPythonPackage
+, dateparser, humanize, pendulum, ruamel_yaml, tzlocal }:
+
+buildPythonPackage rec {
+  pname = "maya";
+  version = "0.3.3";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1x88k4irpckvd7jf2yvqjw1s52hjqbxym1r1d928yb3fkj7rvlxs";
+  };
+
+  patches = [
+    (fetchpatch {
+      # https://github.com/kennethreitz/maya/issues/112
+      # Merged, so should be in next release.
+      url = "https://github.com/kennethreitz/maya/commit/f69a93b1103130139cdec30511777823957fb659.patch";
+      sha256 = "152ba7amv9dhhx1wcklfalsdzsxggik9f7rsrikms921lq9xqc8h";
+    })
+  ];
+
+  propagatedBuildInputs = [ dateparser humanize pendulum ruamel_yaml tzlocal ];
+
+  # No tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Datetimes for Humans";
+    homepage = https://github.com/kennethreitz/maya;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 58b11a9b33a4..9f59fb9fdfda 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10194,6 +10194,8 @@ in {
 
   matrix-client = callPackage ../development/python-modules/matrix-client/default.nix { };
 
+  maya = callPackage ../development/python-modules/maya { };
+
   mccabe = callPackage ../development/python-modules/mccabe { };
 
   mechanize = buildPythonPackage (rec {

From 04fe5bc440b6ee76a6deb3d811596eb16d97b53d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:50:25 +0100
Subject: [PATCH 021/104] python.pkgs.meinheld: init at 0.6.1

---
 .../python-modules/meinheld/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/meinheld/default.nix

diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix
new file mode 100644
index 000000000000..526cd3ed4eec
--- /dev/null
+++ b/pkgs/development/python-modules/meinheld/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage, greenlet }:
+
+buildPythonPackage rec {
+  pname = "meinheld";
+  version = "0.6.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0rg5878njn66cc0x2fwrakikz24946r0cxxl6j8vvz5phd4zygi9";
+  };
+
+  propagatedBuildInputs = [ greenlet ];
+
+  # No tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "High performance asynchronous Python WSGI Web Server";
+    homepage = http://meinheld.org/;
+    license = licenses.bsd3;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9f59fb9fdfda..a0774473c061 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10241,6 +10241,8 @@ in {
 
   meliae = callPackage ../development/python-modules/meliae {};
 
+  meinheld = callPackage ../development/python-modules/meinheld { };
+
   memcached = buildPythonPackage rec {
     name = "memcached-1.51";
 

From 18e10a1e529af8ef0ee2450cdeb37fe50a976c68 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:50:45 +0100
Subject: [PATCH 022/104] python.pkgs.pendulum: init at 1.3.2

---
 .../python-modules/pendulum/default.nix       | 22 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/python-modules/pendulum/default.nix

diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix
new file mode 100644
index 000000000000..e75a264de3db
--- /dev/null
+++ b/pkgs/development/python-modules/pendulum/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchPypi, buildPythonPackage, dateutil, pytzdata, tzlocal }:
+
+buildPythonPackage rec {
+  pname = "pendulum";
+  version = "1.3.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1j6hdsdhhw4d6fy9byr0vyxqnb53ap8bh2a0cibl7p0ks0zvb14j";
+  };
+
+  propagatedBuildInputs = [ dateutil pytzdata tzlocal ];
+
+  # No tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Python datetimes made easy";
+    homepage = https://github.com/sdispater/pendulum;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0774473c061..dcb744393f1c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10442,6 +10442,8 @@ in {
     };
   };
 
+  pendulum = callPackage ../development/python-modules/pendulum { };
+
   pocket = buildPythonPackage rec {
     name = "pocket-${version}";
     version = "0.3.6";

From 851f05ef6904186cee37d7b20495170f2fb5e632 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:51:30 +0100
Subject: [PATCH 023/104] python.pkgs.pytzdata: init at 2017.3.1

---
 .../python-modules/pytzdata/default.nix       | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytzdata/default.nix

diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix
new file mode 100644
index 000000000000..6de0431edb36
--- /dev/null
+++ b/pkgs/development/python-modules/pytzdata/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  pname = "pytzdata";
+  version = "2017.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1wi3jh39zsa9iiyyhynhj7w5b2p9wdyd0ppavpsrmf3wxvr7cwz8";
+  };
+
+  # No tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Timezone database for Python";
+    homepage = https://github.com/sdispater/pytzdata;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dcb744393f1c..a9f4a77117bd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15100,6 +15100,8 @@ in {
     };
   };
 
+  pytzdata = callPackage ../development/python-modules/pytzdata { };
+
   pyutil = buildPythonPackage (rec {
     name = "pyutil-2.0.0";
 

From e2e2cb4961d8c353e995e4dd3a1d2c5191f4e95e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:51:59 +0100
Subject: [PATCH 024/104] python.pkgs.whitenoise: init at 4.0b4

---
 .../python-modules/whitenoise/default.nix     | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/whitenoise/default.nix

diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix
new file mode 100644
index 000000000000..d2359b2195f0
--- /dev/null
+++ b/pkgs/development/python-modules/whitenoise/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchPypi, buildPythonPackage }:
+
+buildPythonPackage rec {
+  pname = "whitenoise";
+  version = "4.0b4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0ra2bbsihwfhnf1ibahzzabgfjfghxqcrbfx6r5r50mlil5n8bf4";
+  };
+
+  # No tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Radically simplified static file serving for WSGI applications";
+    homepage = http://whitenoise.evans.io/;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a9f4a77117bd..4524663e6093 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22479,6 +22479,8 @@ EOF
 
   vine = callPackage ../development/python-modules/vine { };
 
+  whitenoise = callPackage ../development/python-modules/whitenoise { };
+
   wp_export_parser = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "wp_export_parser";

From 5e4e65f92d797dbc409db72603a4136fb31ce041 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:52:21 +0100
Subject: [PATCH 025/104] python.pkgs.raven: fix expression

---
 pkgs/development/python-modules/raven/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix
index 66e2595f8d2f..c13f08da7bab 100644
--- a/pkgs/development/python-modules/raven/default.nix
+++ b/pkgs/development/python-modules/raven/default.nix
@@ -1,12 +1,11 @@
-{ lib, buildPythonPackage, fetchurl, isPy3k, contextlib2 }:
+{ lib, buildPythonPackage, fetchPypi, isPy3k, contextlib2, blinker }:
 
 buildPythonPackage rec {
   pname = "raven";
   version = "6.4.0";
-  name = pname + "-" + version;
 
-  src = fetchurl {
-    url = "mirror://pypi/r/raven/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "00m985w9fja2jf8dpvdhygcr26rwabxkgvcc2v5j6v7d6lrvpvdq";
   };
 
@@ -14,7 +13,7 @@ buildPythonPackage rec {
   # see https://github.com/getsentry/raven-python/blob/master/setup.py
   doCheck = false;
 
-  propagatedBuildInputs = lib.optionals (!isPy3k) [ contextlib2 ];
+  propagatedBuildInputs = [ blinker ] ++ lib.optionals (!isPy3k) [ contextlib2 ];
 
   meta = {
     description = "A Python client for Sentry (getsentry.com)";

From b3eea7ab9c03495d81da9f72ab0905f9238d3a1a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:52:36 +0100
Subject: [PATCH 026/104] python.pkgs.httpbin: fix expression

---
 .../python-modules/httpbin/default.nix         | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix
index 2f24a1ab72bd..77dc27f1096e 100644
--- a/pkgs/development/python-modules/httpbin/default.nix
+++ b/pkgs/development/python-modules/httpbin/default.nix
@@ -1,24 +1,38 @@
 { stdenv
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , flask
+, flask-common
+, flask-limiter
 , markupsafe
 , decorator
 , itsdangerous
+, raven
 , six
+, brotlipy
 }:
 
 buildPythonPackage rec {
   pname = "httpbin";
   version = "0.6.2";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0afa0486a76305cac441b5cc80d5d4ccd82b20875da7c5119ecfe616cefef45f";
   };
 
-  propagatedBuildInputs = [ flask markupsafe decorator itsdangerous six ];
+  patches = [
+    # https://github.com/kennethreitz/httpbin/issues/403
+    # https://github.com/kennethreitz/flask-common/issues/7
+    # https://github.com/evansd/whitenoise/issues/166
+    (fetchpatch {
+      url = "https://github.com/javabrett/httpbin/commit/5735c888e1e51b369fcec41b91670a90535e661e.patch";
+      sha256 = "167h8mscdjagml33dyqk8nziiz3dqbggnkl6agsirk5270nl5f7q";
+    })
+  ];
+
+  propagatedBuildInputs = [ brotlipy flask flask-common flask-limiter markupsafe decorator itsdangerous raven six ];
 
   # No tests
   doCheck = false;

From 48eab55d8bb92d56572d490ed6a167c0792cf9a5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:52:54 +0100
Subject: [PATCH 027/104] python.pkgs.pytest-httpbin: 0.2.3 -> 0.3.0

---
 .../python-modules/pytest-httpbin/default.nix          | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix
index 6f6f79109d9b..caa2c27e3f85 100644
--- a/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/pkgs/development/python-modules/pytest-httpbin/default.nix
@@ -11,21 +11,17 @@
 
 buildPythonPackage rec {
   pname = "pytest-httpbin";
-  name = "${pname}-${version}";
-  version = "0.2.3";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "kevin1024";
     repo = "pytest-httpbin";
     rev = "v${version}";
-    sha256 = "0j3n12jjy8cm0va8859wqra6abfyajrgh2qj8bhcngf3a72zl9ks";
+    sha256 = "0p86ljx775gxxicscs1dydmmx92r1g9bs00vdvxrsl3qdll1ksfm";
   };
 
-  checkPhase = ''
-    py.test -k "not test_chunked_encoding"
-  '';
+  checkInputs = [ pytest ];
 
-  buildInputs = [ pytest ];
   propagatedBuildInputs = [ flask decorator httpbin six requests ];
 
   meta = {

From f1c7f024f3351904bf81349d111e7d7c9c8ab78d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 7 Jan 2018 11:01:38 +0100
Subject: [PATCH 028/104] python.pkgs.bleach: move expression

---
 .../python-modules/bleach/default.nix         | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 33 +--------------
 2 files changed, 41 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/development/python-modules/bleach/default.nix

diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
new file mode 100644
index 000000000000..dc417a54ca3e
--- /dev/null
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, pytestrunner
+, six
+, html5lib
+}:
+
+buildPythonPackage rec {
+  pname = "bleach";
+  version = "2.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0c5w7hh70lqzca7ir71j891csvch1899r8q09zgswk1y00q22lmr";
+  };
+
+  checkInputs = [ pytest pytestrunner ];
+  propagatedBuildInputs = [ six html5lib ];
+
+  meta = {
+    description = "An easy, HTML5, whitelisting HTML sanitizer";
+    longDescription = ''
+      Bleach is an HTML sanitizing library that escapes or strips markup and
+      attributes based on a white list. Bleach can also linkify text safely,
+      applying filters that Django's urlize filter cannot, and optionally
+      setting rel attributes, even on links already in the text.
+
+      Bleach is intended for sanitizing text from untrusted sources. If you
+      find yourself jumping through hoops to allow your site administrators
+      to do lots of things, you're probably outside the use cases. Either
+      trust those users, or don't.
+    '';
+    homepage = https://github.com/mozilla/bleach;
+    downloadPage = https://github.com/mozilla/bleach/releases;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ prikhi ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4524663e6093..be2d2fbede44 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1746,38 +1746,7 @@ in {
 
   httpserver = callPackage ../development/python-modules/httpserver {};
 
-  bleach = buildPythonPackage rec {
-    pname = "bleach";
-    version = "2.0.0";
-    name = "${pname}-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-      sha256 = "0c5w7hh70lqzca7ir71j891csvch1899r8q09zgswk1y00q22lmr";
-    };
-
-    buildInputs = with self; [ pytest pytestrunner ];
-    propagatedBuildInputs = with self; [ six html5lib ];
-
-    meta = {
-      description = "An easy, HTML5, whitelisting HTML sanitizer";
-      longDescription = ''
-        Bleach is an HTML sanitizing library that escapes or strips markup and
-        attributes based on a white list. Bleach can also linkify text safely,
-        applying filters that Django's urlize filter cannot, and optionally
-        setting rel attributes, even on links already in the text.
-
-        Bleach is intended for sanitizing text from untrusted sources. If you
-        find yourself jumping through hoops to allow your site administrators
-        to do lots of things, you're probably outside the use cases. Either
-        trust those users, or don't.
-      '';
-      homepage = https://github.com/mozilla/bleach;
-      downloadPage = https://github.com/mozilla/bleach/releases;
-      license = licenses.asl20;
-      maintainers = with maintainers; [ prikhi ];
-    };
-  };
+  bleach = callPackage ../development/python-modules/bleach { };
 
   # needed for tensorflow-tensorboard
   bleach_1_5_0 = self.bleach.overridePythonAttrs rec {

From d16f07bdb967bf941cb036d2385d6748ca10baf2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 7 Jan 2018 11:01:54 +0100
Subject: [PATCH 029/104] python.pkgs.ansicolors: 1.0.2 -> 1.1.8

---
 .../python-modules/ansicolors/default.nix          | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix
index 9192186cd717..a737cb06ea22 100644
--- a/pkgs/development/python-modules/ansicolors/default.nix
+++ b/pkgs/development/python-modules/ansicolors/default.nix
@@ -1,15 +1,21 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest }:
 
 buildPythonPackage rec {
   pname = "ansicolors";
-  version = "1.0.2";
-  name = "${pname}-${version}";
+  version = "1.1.8";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "02lmh2fbqcwr98cq13l9ql0fvyad1dcb3ap3c5xq9qwjp45m6r3n";
+    extension = "zip";
+    sha256 = "99f94f5e3348a0bcd43c82e5fc4414013ccc19d70bd939ad71e0133ce9c372e0";
   };
 
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://github.com/verigak/colors/;
     description = "ANSI colors for Python";

From 54e60bdc5e46527627e4bef4e99dfe02fa59ffff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 7 Jan 2018 11:03:28 +0100
Subject: [PATCH 030/104] python: bleach: 2.0.0 -> 2.1.2

---
 pkgs/development/python-modules/bleach/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index dc417a54ca3e..eafeae0f477c 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "bleach";
-  version = "2.0.0";
+  version = "2.1.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0c5w7hh70lqzca7ir71j891csvch1899r8q09zgswk1y00q22lmr";
+    sha256 = "38fc8cbebea4e787d8db55d6f324820c7f74362b70db9142c1ac7920452d1a19";
   };
 
   checkInputs = [ pytest pytestrunner ];

From 9cb334bd7058edb75fda31d31ab66dbababb9225 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:56:46 +0100
Subject: [PATCH 031/104] python: absl-py: 0.1.7 -> 0.1.9

---
 pkgs/development/python-modules/absl-py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/absl-py/default.nix b/pkgs/development/python-modules/absl-py/default.nix
index ca43e122a307..5e295bb9516e 100644
--- a/pkgs/development/python-modules/absl-py/default.nix
+++ b/pkgs/development/python-modules/absl-py/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "absl-py";
-  version = "0.1.7";
+  version = "0.1.9";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4ea22ae860f3a556511291e7f1284942199c81377f47ec4248163defb1b9e6ee";
+    sha256 = "1c787e3bc7ef8fea7a8a79cf36b0c550b4bd66e13c05d1352fbc5786488befb0";
   };
 
   propagatedBuildInputs = [ six ];

From 8e4486f6bbdd7859e4b2aee28c6b334bda96342c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:56:51 +0100
Subject: [PATCH 032/104] python: aiohttp: 2.3.7 -> 2.3.9

---
 pkgs/development/python-modules/aiohttp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index 44e19072057f..f1eb7a64d79e 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "2.3.7";
+  version = "2.3.9";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fe294df38e9c67374263d783a7a29c79372030f5962bd5734fa51c6f4bbfee3b";
+    sha256 = "6003bed78dc591d31bd89ef16e630a1c4fd97a3cd17b975ec945c0f46d6fc881";
   };
 
   disabled = pythonOlder "3.4";

From a50c205100622007b025e65b1f1a820eb7d0771e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:56:56 +0100
Subject: [PATCH 033/104] python: alembic: 0.9.6 -> 0.9.7

---
 pkgs/development/python-modules/alembic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index 364f4cf9a3ab..54e1a753597c 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "alembic";
-  version = "0.9.6";
+  version = "0.9.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "042851ebe9efa07be6dc1395b1793b6c1d8964a39b73a0ce1649e2bcd41ea732";
+    sha256 = "46f4849c6dce69f54dd5001b3215b6a983dee6b17512efee10e237fa11f20cfa";
   };
 
   buildInputs = [ pytest pytestcov mock coverage ];

From 702bb0118306ff8ce8770429d4eb359d606e2c6c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:01 +0100
Subject: [PATCH 034/104] python: APScheduler: 3.5.0 -> 3.5.1

---
 pkgs/development/python-modules/APScheduler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix
index 931239c09872..8af07ece6873 100644
--- a/pkgs/development/python-modules/APScheduler/default.nix
+++ b/pkgs/development/python-modules/APScheduler/default.nix
@@ -20,12 +20,12 @@
 
 buildPythonPackage rec {
   pname = "APScheduler";
-  version = "3.5.0";
+  version = "3.5.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ce44d5132b7951f4614067c88ca34cfee1ff97f6f0892581d79b636d83eab89";
+    sha256 = "952c8f46a11f32b9d5bfbe3e347dac2cdf0680d8b4799590dc9c3a9865b73b65";
   };
 
   buildInputs = [

From 8af9928c9db26da5119277e6b4d0fc87868ca941 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:05 +0100
Subject: [PATCH 035/104] python: arrow: 0.12.0 -> 0.12.1

---
 pkgs/development/python-modules/arrow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix
index 374b82225a1a..65f4ae79f4b3 100644
--- a/pkgs/development/python-modules/arrow/default.nix
+++ b/pkgs/development/python-modules/arrow/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "arrow";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a15ecfddf334316e3ac8695e48c15d1be0d6038603b33043930dcf0e675c86ee";
+    sha256 = "a558d3b7b6ce7ffc74206a86c147052de23d3d4ef0e17c210dd478c53575c4cd";
   };
 
   checkPhase = ''

From 0d3929bec9aabbfa7394af23c0764a129bc7a67c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:10 +0100
Subject: [PATCH 036/104] python: asana: 0.6.5 -> 0.6.7

---
 pkgs/development/python-modules/asana/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix
index 41a111c3167a..7990ece749b5 100644
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "asana";
-  version = "0.6.5";
+  version = "0.6.7";
   name = "${pname}-${version}";
 
   meta = {
@@ -15,7 +15,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "eab8d24c2a4670b541b75da2f4bf5b995fe71559c1338da53ce9039f7b19c9a0";
+    sha256 = "d576601116764050c4cf63b417f1c24700b76cf6686f0e51e6b0b77d450e7973";
   };
 
   checkInputs = [ pytest ];

From c18d3ac845f52e0d8c4e2ae0a6600cf727a033be Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:15 +0100
Subject: [PATCH 037/104] python: asgiref: 2.0.1 -> 2.1.0

---
 pkgs/development/python-modules/asgiref/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix
index fedd4b81a9d4..d88f44149bf2 100644
--- a/pkgs/development/python-modules/asgiref/default.nix
+++ b/pkgs/development/python-modules/asgiref/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchurl, six }:
 buildPythonPackage rec {
-  version = "2.0.1";
+  version = "2.1.0";
   pname = "asgiref";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgiref/${name}.tar.gz";
-    sha256 = "c3d70c473a2b7e525e18e68504630943e107f5b32f440c00c8543f94f565c855";
+    sha256 = "2bfd70fcc51df4036768b91d7b13524090dc8f366d79fa44ba2b0aeb47306344";
   };
 
   propagatedBuildInputs = [ six ];

From 4c36da3ffd9d77cf8d729ee19ffad042c57fb3ef Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:20 +0100
Subject: [PATCH 038/104] python: botocore: 1.8.26 -> 1.8.33

---
 pkgs/development/python-modules/botocore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix
index e50f1d46f49f..8f9c0fd74e6b 100644
--- a/pkgs/development/python-modules/botocore/default.nix
+++ b/pkgs/development/python-modules/botocore/default.nix
@@ -12,11 +12,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "botocore";
-  version = "1.8.26";
+  version = "1.8.33";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09j3b80l401hwc3ha0s2c2qq6z45x846an09ybc9y8cb1ky0kdlv";
+    sha256 = "fa29ea54f26b1193682332d3b4cdde7aa79b4eaccb23f70e88672509c24546f4";
   };
 
   propagatedBuildInputs = [

From ae18e9629c372e6676fbf2c44e4f88ced8c7f2a9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:25 +0100
Subject: [PATCH 039/104] python: certifi: 2017.7.27.1 -> 2018.1.18

---
 pkgs/development/python-modules/certifi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index 79eea0574546..d36f0f308d33 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2017.7.27.1";
+  version = "2018.1.18";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "40523d2efb60523e113b44602298f0960e900388cf3bb6043f645cf57ea9e3f5";
+    sha256 = "edbc3f203427eef571f79a7692bb160a2b0f7ccaa31953e99bd17e307cf63f7d";
   };
 
   meta = {

From 007cd5262f12a9883cbac44c4f894d3469966f7e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:30 +0100
Subject: [PATCH 040/104] python: cffi: 1.11.2 -> 1.11.4

---
 pkgs/development/python-modules/cffi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index f8e313d660eb..cc6ad6a32a7e 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -2,12 +2,12 @@
 
 if isPyPy then null else buildPythonPackage rec {
   pname = "cffi";
-  version = "1.11.2";
+  version = "1.11.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6";
+    sha256 = "df9083a992b17a28cd4251a3f5c879e0198bb26c9e808c4647e0a18739f1d11d";
   };
 
   patches = stdenv.lib.optional (isPy27 && stdenv.cc.isClang) ./clang.patch;

From 402417b669ede945c33bbea74bdeb43119eb7ca3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:34 +0100
Subject: [PATCH 041/104] python: dask: 0.16.0 -> 0.16.1

---
 pkgs/development/python-modules/dask/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index c3b45dc3c867..79e423d4847b 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "0.16.0";
+  version = "0.16.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "40d150b73e3366c9521e9dde206046a66906330074f87be901b1e1013ce6cb73";
+    sha256 = "07a0609ce053c8c2675037e6d5242899f90ecfb5262e1d0b2d7264fe8814099c";
   };
 
   checkInputs = [ pytest ];

From 1d4d7f054543c82ce425546a74abfa22286f37ad Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:39 +0100
Subject: [PATCH 042/104] python: decorator: 4.1.2 -> 4.2.1

---
 pkgs/development/python-modules/decorator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix
index e3ee3117501b..e852ac0385ca 100644
--- a/pkgs/development/python-modules/decorator/default.nix
+++ b/pkgs/development/python-modules/decorator/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "decorator";
-  version = "4.1.2";
+  version = "4.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7cb64d38cb8002971710c8899fbdfb859a23a364b7c99dab19d1f719c2ba16b5";
+    sha256 = "7d46dd9f3ea1cf5f06ee0e4e1277ae618cf48dfb10ada7c8427cd46c42702a0e";
   };
 
   meta = {

From 16a1a98d4e1785f17ef6e1696354618f04eb8722 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:43 +0100
Subject: [PATCH 043/104] python: devpi-common: 3.2.0 -> 3.2.1

---
 pkgs/development/python-modules/devpi-common/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix
index f2be8ec56381..c43d34a9b555 100644
--- a/pkgs/development/python-modules/devpi-common/default.nix
+++ b/pkgs/development/python-modules/devpi-common/default.nix
@@ -2,12 +2,12 @@
 
 with pythonPackages;buildPythonPackage rec {
   pname = "devpi-common";
-  version = "3.2.0";
+  version = "3.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0rh119iw5hk41gsvbjr0wixvl1i4f0b1vcnw9ym35rmcp517z0wb";
+    sha256 = "e9afa277a9b227d92335c49fab40be2e9bb112c0f4dda84906c14addb1ded2f7";
   };
 
   propagatedBuildInputs = [ requests py ];

From a51469ee941c37b7bf862c51de03089ac9c303eb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:48 +0100
Subject: [PATCH 044/104] python: django-ipware: 1.1.6 -> 2.0.1

---
 pkgs/development/python-modules/django-ipware/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix
index c4d993ac03ba..1f3aedab8102 100644
--- a/pkgs/development/python-modules/django-ipware/default.nix
+++ b/pkgs/development/python-modules/django-ipware/default.nix
@@ -3,7 +3,7 @@
 buildPythonPackage rec {
   pname = "django-ipware";
   name = "${pname}-${version}";
-  version = "1.1.6";
+  version = "2.0.1";
 
   meta = {
     description = "A Django application to retrieve user's IP address";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00zah4g2h93nbsijz556j97v9qkn9sxcia1a2wrwdwnav2fhzack";
+    sha256 = "3fba8821298c8533ce5609debf31dc8a22f228c50e100f42d97637a9f9357d43";
   };
 
   propagatedBuildInputs = [ django ];

From 85b40fe6cd42937ef765e760f37bfc225e4bff01 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:52 +0100
Subject: [PATCH 045/104] python: ECPy: 0.8.2 -> 0.8.3

---
 pkgs/development/python-modules/ecpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix
index 25ca8dabf2bf..84830e7f2b83 100644
--- a/pkgs/development/python-modules/ecpy/default.nix
+++ b/pkgs/development/python-modules/ecpy/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "ECPy";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0509a90714448ef47ef727cb7aee3415995c883c945e972521b5838fa4c50e24";
+    sha256 = "ef3d95419d53368f52fb7d4b883b8df0dfc2dd19a76243422d24981c3e5f27bd";
   };
 
   buildInputs = [ hidapi pycrypto pillow protobuf future ];

From 64688b66a60c525d503ecd132f93a20f9bdd6514 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:57:57 +0100
Subject: [PATCH 046/104] python: elasticsearch: 6.0.0 -> 6.1.1

---
 pkgs/development/python-modules/elasticsearch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix
index 9b90b09c5f5f..88399d316975 100644
--- a/pkgs/development/python-modules/elasticsearch/default.nix
+++ b/pkgs/development/python-modules/elasticsearch/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage (rec {
   pname = "elasticsearch";
-  version = "6.0.0";
+  version = "6.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "029q603g95fzkh87xkbxxmjfq5s9xkr9y27nfik6d4prsl0zxmlz";
+    sha256 = "8d91a3fce12123a187b673f18c23bcffa6e7b49ba057555d59eeeded0ba15dce";
   };
 
   # Check is disabled because running them destroy the content of the local cluster!

From af0f6a4a7827b9dd7851361a85ceb614be55b2b7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:02 +0100
Subject: [PATCH 047/104] python: Eve: 0.7.5 -> 0.7.6

---
 pkgs/development/python-modules/eve/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix
index d77b912fe0de..fe6daf73339f 100644
--- a/pkgs/development/python-modules/eve/default.nix
+++ b/pkgs/development/python-modules/eve/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "Eve";
-  version = "0.7.5";
+  version = "0.7.6";
   name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dd4ffbc4725220ffdc8e32f8566c8870efaecdc238d0f96b18e1e83227eca55d";
+    sha256 = "1ba84ab471bc2203a728fe4707a9279c44420224180b418601778125f51577ff";
   };
 
   patches = [

From cfbd59c93c8f990ac59bd3f648aac92c828e6cbd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:07 +0100
Subject: [PATCH 048/104] python: fonttools: 3.21.1 -> 3.21.2

---
 pkgs/development/python-modules/fonttools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index f7dfb5a8edf5..80fc3893f17c 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.21.1";
+  version = "3.21.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1whama3bm34xp9l7f543sz2h9dms77ci820sdbxi5dl9krs4xkxb";
+    sha256 = "96b636793c806206b1925e21224f4ab2ce5bea8ae0990ed181b8ac8d30848f47";
     extension = "zip";
   };
 

From 7333ffb7df44832d6e00ed52b0f24eb0f8f976b6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:12 +0100
Subject: [PATCH 049/104] python: google-api-core: 0.1.3 -> 0.1.4

---
 pkgs/development/python-modules/google_api_core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix
index c4275c47a424..2899eeb4a8af 100644
--- a/pkgs/development/python-modules/google_api_core/default.nix
+++ b/pkgs/development/python-modules/google_api_core/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "03bc4b1ab69c0e113af07e706edee50f583abe8219fe1e1d529dee191cb8e0bf";
+    sha256 = "0144d467083ed54d2e8ccb4212d42c3724fe0b844b7d3a0ff85aea54b7ae8347";
   };
 
   propagatedBuildInputs = [ google_auth protobuf googleapis_common_protos requests grpcio ];

From 21b31a439db06859e61dd619ea9ece9cd80c3c5d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:17 +0100
Subject: [PATCH 050/104] python: google-auth: 1.2.1 -> 1.3.0

---
 pkgs/development/python-modules/google_auth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix
index 04dfd26a0e8c..2076f3c34441 100644
--- a/pkgs/development/python-modules/google_auth/default.nix
+++ b/pkgs/development/python-modules/google_auth/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "041qpwlvpawggasvbfpkx39mkg4dgvivj831x7kinidayrf46w3i";
+    sha256 = "d119b5954393d81c4a986ab420cf2c8129fc95ff5c4c6bb8ab5c8f3e6446394f";
   };
 
   checkInputs = [ pytest mock oauth2client flask requests urllib3 pytest-localserver ];

From 4d68c2ea3f32b0e7a8874e08dff2c2c6679f6925 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:21 +0100
Subject: [PATCH 051/104] python: grpcio: 1.8.3 -> 1.8.4

---
 pkgs/development/python-modules/grpcio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index 3fe7dc751c86..c22f2c2f4d7b 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "grpcio";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6ce5fd3093ddc09a152981d5c477ac645eda19dfcc819e45d8c57da6b743bd53";
+    sha256 = "88d87aab9c7889b3ab29dd74aac1a5493ed78b9bf5afba1c069c9dd5531f951d";
   };
 
   propagatedBuildInputs = [ six protobuf ]

From a8c928a4ebfbac3161cc641139424812675acbff Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:26 +0100
Subject: [PATCH 052/104] python: ipykernel: 4.7.0 -> 4.8.0

---
 pkgs/development/python-modules/ipykernel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index 8547a3ef99e9..330141fcd06e 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "ipykernel";
-  version = "4.7.0";
+  version = "4.8.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "354986612a38f0555c43d5af2425e2a67506b63b313a0325e38904003b9d977b";
+    sha256 = "dedc199df6a38725c732986dfa606c245fb8fe0fe999b33a0c305b73d80c6774";
   };
 
   buildInputs = [ nose ] ++ lib.optional isPy27 mock;

From be5d623946e6028372a60a6e740d03bb057171cc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:31 +0100
Subject: [PATCH 053/104] python: Keras: 2.1.2 -> 2.1.3

---
 pkgs/development/python-modules/keras/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index b6c56cc8bc68..8ef263cdfa80 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "Keras";
-  version = "2.1.2";
+  version = "2.1.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3ee56fc129d9d00b1916046e50056047836f97ada59df029e5661fb34442d5e8";
+    sha256 = "7ca3a381523bad40a6922e88951a316664cb088fd01cea07e5ec8ada3327e3c7";
   };
 
   checkInputs = [

From c20c96b9231ba9b874a9c417497b454113d01523 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:35 +0100
Subject: [PATCH 054/104] python: keyring: 10.5.1 -> 10.6.0

---
 pkgs/development/python-modules/keyring/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index f88bdb84e0c3..29b426ac1ee4 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "keyring";
-  version = "10.5.1";
+  version = "10.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f10674bb6ecbf82e2b713627c48ad0e84178e1c9d3dc1f0373261a0765402fb2";
+    sha256 = "69c2b69d66a0db1165c6875c1833c52f4dc62179959692b30c8c4a4b8390d895";
   };
 
   buildInputs = [

From 52bcbcf232b5b5ad4dbf9bd01cf6619f1433d78c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:40 +0100
Subject: [PATCH 055/104] python: libagent: 0.9.5 -> 0.9.7

---
 pkgs/development/python-modules/libagent/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index e8cecda75897..d6c96534d748 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "libagent";
-  version = "0.9.5";
+  version = "0.9.7";
 
   src = fetchPypi{
     inherit pname version;
-    sha256 = "982b81c19dc9ee1158dc32fedbe1c36aff2b6872fa0dd42173b639b965ccfb2e";
+    sha256 = "3ae14dc14859f7b4b92583ab0d40884ac07f26dbe00c7b747df2d50f4b1af098";
   };
 
   buildInputs = [

From 97563a628716828c0cec5194a85419fc77e95488 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:45 +0100
Subject: [PATCH 056/104] python: moto: 1.1.25 -> 1.2.0

---
 pkgs/development/python-modules/moto/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix
index d5c40c67b36b..84096d8aa921 100644
--- a/pkgs/development/python-modules/moto/default.nix
+++ b/pkgs/development/python-modules/moto/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "moto";
-  version = "1.1.25";
+  version = "1.2.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d427d6e1a81e926c2b6a071453807b05f4736d65068493e1f3055ac7ee24ea21";
+    sha256 = "c42b894cdf35412c95f0c6b40309cf802436e049cd172dc5db7516c7b845191b";
   };
 
   propagatedBuildInputs = [

From 480904d535cb4d3a3ce56d72be5f96856779baf7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:49 +0100
Subject: [PATCH 057/104] python: multidict: 3.3.2 -> 4.0.0

---
 pkgs/development/python-modules/multidict/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index 614157542b16..7b5ea46ec34c 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -8,13 +8,13 @@
 
 let
   pname = "multidict";
-  version = "3.3.2";
+  version = "4.0.0";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "f82e61c7408ed0dce1862100db55595481911f159d6ddec0b375d35b6449509b";
+    sha256 = "b72486b3ad2b8444f7afebdafda8b111c1803e37203dfe81b7765298f2781778";
   };
 
   buildInputs = [ cython ];

From 564ad3051cce83da5413dce43f639ba79822a1d8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:54 +0100
Subject: [PATCH 058/104] python: nimfa: 1.3.2 -> 1.3.4

---
 pkgs/development/python-modules/nimfa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nimfa/default.nix b/pkgs/development/python-modules/nimfa/default.nix
index b38aea7d28c0..26f1ea3294bb 100644
--- a/pkgs/development/python-modules/nimfa/default.nix
+++ b/pkgs/development/python-modules/nimfa/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "nimfa";
-  version = "1.3.2";
+  version = "1.3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0iqcrr48jwy7nh8g13xf4rvpw9wq5qs3hyd6gqlh30mgyn9i85w7";
+    sha256 = "651376eba6b049fe270dc0d29d4b2abecb5e998c2013df6735a97875503e2ffe";
   };
 
   propagatedBuildInputs = [ numpy scipy ];

From 2426291916dbaa049842ab53724c8ea3a2791b6d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:58:58 +0100
Subject: [PATCH 059/104] python: node-semver: 0.2.0 -> 0.3.0

---
 pkgs/development/python-modules/node-semver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix
index 8c518f9b7ff4..7351d2edfd3f 100644
--- a/pkgs/development/python-modules/node-semver/default.nix
+++ b/pkgs/development/python-modules/node-semver/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
-  version = "0.2.0";
+  version = "0.3.0";
   pname = "node-semver";
 
   buildInputs = [ pytest tox ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c32bfc976fd9e003c4a15665e5fe9f337366ba6b60aeb34e4479da9d7bbb0081";
+    sha256 = "d8a3906e7677f8ab05aeb3fc94c7a2fa163def5507271452ce6831282f23f1cb";
   };
 
   meta = with stdenv.lib; {

From 7a7b6d6360cb58b6d516c086f3a6571801a297ac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:59:07 +0100
Subject: [PATCH 060/104] python: phonenumbers: 8.8.8 -> 8.8.9

---
 pkgs/development/python-modules/phonenumbers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 69808a7bff3b..14e59ce3a955 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.8.8";
+  version = "8.8.9";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ff2f492e49c212bb7185954efe09e68583a67daec586c02c49bc728c343d4eb0";
+    sha256 = "d819299c3aa8f85f248295ab8559e202af429b4017301b122a0b4c387aed10d2";
   };
 
   meta = {

From 2aae8ca268ef053e80b445c573fe2a149fcb9ae3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:59:12 +0100
Subject: [PATCH 061/104] python: prov: 1.5.0 -> 1.5.1

---
 pkgs/development/python-modules/prov/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/prov/default.nix b/pkgs/development/python-modules/prov/default.nix
index bf4b38aa146b..9dac8677c33b 100644
--- a/pkgs/development/python-modules/prov/default.nix
+++ b/pkgs/development/python-modules/prov/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "prov";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vkpayns0mf7i2357vxyvi2n5h5xsyg56ik2yqgrc91k3gx4x9wn";
+    sha256 = "7a2d72b0df43cd9c6e374d815c8ce3cd5ca371d54f98f837853ac9fcc98aee4c";
   };
 
   propagatedBuildInputs = [

From b1dc19f7c9fa2b0aa62aa013721ba9f37609a283 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:59:16 +0100
Subject: [PATCH 062/104] python: pylast: 2.0.0 -> 2.1.0

---
 pkgs/development/python-modules/pylast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix
index 1fcc72115049..e9b4db49dbd9 100644
--- a/pkgs/development/python-modules/pylast/default.nix
+++ b/pkgs/development/python-modules/pylast/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pylast";
-  version = "2.0.0";
+  version = "2.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8e4d4962aa12d67bd357e1aa596a146b2e97afd943b5c9257e555014d13b3065";
+    sha256 = "b9b51dc40a7d3ac3eee17ab5b462b8efb7f2c2ff195261ea846ae4e1168e1c5b";
   };
 
   propagatedBuildInputs = [ certifi six ];

From 47ddc8283b9b0a0d4a9d1ac2fdf95ddd406195df Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:59:21 +0100
Subject: [PATCH 063/104] python: pyodbc: 4.0.21 -> 4.0.22

---
 pkgs/development/python-modules/pyodbc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
index b236715a5d65..0fab9979aaca 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyodbc";
-  version = "4.0.21";
+  version = "4.0.22";
   name = "${pname}-${version}";
   disabled = isPyPy;  # use pypypdbc instead
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9655f84ca9e5cb2dfffff705601017420c840d55271ba62dd44f05383eff0329";
+    sha256 = "e2d742b42c8b92b10018c51d673fe72d925ab90d4dbaaccd4f209e10e228ba73";
   };
 
   buildInputs = [ libiodbc ];

From 866d186ffdb6570c7992a59a318b587a61b9fa9e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:59:26 +0100
Subject: [PATCH 064/104] python: pyopencl: 2017.2.2 -> 2018.1

---
 pkgs/development/python-modules/pyopencl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index 07ff8735b52f..a2d019374c96 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2017.2.2";
+  version = "2018.1";
 
   checkInputs = [ pytest ];
   buildInputs = [ opencl-headers ocl-icd ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d2f7b04d2e819c6e90d6366b7712a7452a39fba218e51b11b02c85ab07fd2983";
+    sha256 = "b692966bbaaa65ef8949ee25660d6b0cc7cbadc7f4a35eb9c5139dfa4dde6d4a";
   };
 
   # py.test is not needed during runtime, so remove it from `install_requires`

From 06b1ecdf5f12be1fe72563d8bbe9b4f4edf1a0b7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:59:31 +0100
Subject: [PATCH 065/104] python: pytest-xdist: 1.21.0 -> 1.22.0

---
 pkgs/development/python-modules/pytest-xdist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 2e2975e65968..d671fd9654a4 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-xdist";
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0b8622435e3c0650a8d5a07b73a7f9c4f79b52d7ed060536a6041f0da423ba8e";
+    sha256 = "65228a859191f2c74ee68c127317eefe35eedd3d43fc1431f19240663b0cafcd";
   };
 
   buildInputs = [ pytest setuptools_scm pytest-forked];

From a40f160d072c5ec7af72f722c43398207464ee00 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:59:36 +0100
Subject: [PATCH 066/104] python: raven: 6.4.0 -> 6.5.0

---
 pkgs/development/python-modules/raven/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix
index c13f08da7bab..b6cc70ed787c 100644
--- a/pkgs/development/python-modules/raven/default.nix
+++ b/pkgs/development/python-modules/raven/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "raven";
-  version = "6.4.0";
+  version = "6.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00m985w9fja2jf8dpvdhygcr26rwabxkgvcc2v5j6v7d6lrvpvdq";
+    sha256 = "84da75114739191bdf2388f296ffd6177e83567a7fbaf2701e034ad6026e4f3b";
   };
 
   # way too many dependencies to run tests

From bea86ca20c6689f12d158b3039407f33f4d92247 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:59:41 +0100
Subject: [PATCH 067/104] python: regex: 2017.12.12 -> 2018.01.10

---
 pkgs/development/python-modules/regex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index a1349ae5c36d..c6279f5e7c41 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "regex";
-  version = "2017.12.12";
+  version = "2018.01.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ee069308c2757e565cc2b6f417ba5288e76cfe4c1764b6826063f4fbd53219d7";
+    sha256 = "139678fc013b75e486e580c39b4c52d085ed7362e400960f8be1711a414f16b5";
   };
 
   meta = {

From f1b4c710cb137bcf7322b16d72959bd8620c91af Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:59:46 +0100
Subject: [PATCH 068/104] python: schema: 0.6.6 -> 0.6.7

---
 pkgs/development/python-modules/schema/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix
index 2c57ce295825..2c8e63e5ed2f 100644
--- a/pkgs/development/python-modules/schema/default.nix
+++ b/pkgs/development/python-modules/schema/default.nix
@@ -3,12 +3,12 @@
 buildPythonPackage rec {
 
   pname = "schema";
-  version = "0.6.6";
+  version = "0.6.7";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lw28j9w9vxyigg7vkfkvi6ic9lgjkdnfvnxdr7pklslqvzmk2vm";
+    sha256 = "410f44cb025384959d20deef00b4e1595397fa30959947a4f0d92e9c84616f35";
   };
 
   checkInputs = [ pytest ];

From 78ff151b9bbdccfef76fa48fbf7ae8f905dc8db8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 11:59:56 +0100
Subject: [PATCH 069/104] python: Sphinx: 1.6.5 -> 1.6.6

---
 pkgs/development/python-modules/sphinx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index e83ab1c724aa..6f3d0b3c117b 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -27,10 +27,10 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Sphinx";
-  version = "1.6.5";
+  version = "1.6.6";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c6de5dbdbb7a0d7d2757f4389cc00e8f6eb3c49e1772378967a12cfcf2cfe098";
+    sha256 = "c39a6fa41bd3ec6fc10064329a664ed3a3ca2e27640a823dc520c682e4433cdb";
   };
   LC_ALL = "en_US.UTF-8";
 

From 3045f662b167f62dbb3b44f52bf3b1b0a8f80297 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:00:01 +0100
Subject: [PATCH 070/104] python: SQLAlchemy: 1.2.0 -> 1.2.1

---
 pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 488e78cb4ee4..35140f2822de 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -11,11 +11,11 @@
 buildPythonPackage rec {
   pname = "SQLAlchemy";
   name = "${pname}-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "7dda3e0b1b12215e3bb05368d1abbf7d747112a43738e0a4e6deb466b83fd88e";
+    sha256 = "9ede7070d6fd18f28058be88296ed67893e2637465516d6a596cd9afea97b154";
   };
 
   checkInputs = [

From 5f47916fc5399c93c47c7f6e521bfe16e40d99a4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:00:05 +0100
Subject: [PATCH 071/104] python: stripe: 1.77.0 -> 1.77.1

---
 pkgs/development/python-modules/stripe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index e2a88a9f10b5..22c047fc54e2 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "1.77.0";
+  version = "1.77.1";
   name = "${pname}-${version}";
 
   # Tests require network connectivity and there's no easy way to disable
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6503851d2309dd9c1307e3f0a1cb33ac1427fee25d38ecba1f8bf73a0d74defc";
+    sha256 = "d1c638b417301849ff4ee0327332cfdec96edda83c79b08af307339138077d59";
   };
 
   buildInputs = [ unittest2 mock ];

From 7da474670ca07da7a49950eb240deba74c514a8d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:00:10 +0100
Subject: [PATCH 072/104] python: tifffile: 0.13.0 -> 0.13.4

---
 pkgs/development/python-modules/tifffile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix
index 3acc42ce2cc3..b0c3131785f3 100644
--- a/pkgs/development/python-modules/tifffile/default.nix
+++ b/pkgs/development/python-modules/tifffile/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "tifffile";
-  version = "0.13.0";
+  version = "0.13.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1rqx2bar6dcsbmzq68mjh5bsyjzhbkqxi2dsv7j0vdbnjs5dfq9q";
+    sha256 = "43d3903e8ea4542aaa4759ec3683641555d3a15e68fa5a41aaf14cce4110641a";
   };
 
   checkInputs = [ nose ];

From 36168f2bfc2c916da7911ffd7c96d4f302e17907 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:00:14 +0100
Subject: [PATCH 073/104] python: tiros: 1.0.40 -> 1.0.42

---
 pkgs/development/python-modules/tiros/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tiros/default.nix b/pkgs/development/python-modules/tiros/default.nix
index a620c6eb58df..7bf21b025219 100644
--- a/pkgs/development/python-modules/tiros/default.nix
+++ b/pkgs/development/python-modules/tiros/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   pname = "tiros";
   name = "${pname}-${version}";
-  version = "1.0.40";
+  version = "1.0.42";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "841ca13564e3cddfd1404cbc60b3433bcc1e31c2753ecea20d0ad68173b80169";
+    sha256 = "d0f9bc6d463654c971a78e02a3159ec62a2db684a217a7e940e66d4a381bdd52";
   };
 
   patchPhase = ''

From 752ebd03a6f591794fc807021e83d6a81b315e90 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:00:24 +0100
Subject: [PATCH 074/104] python: uncertainties: 3.0.1 -> 3.0.2

---
 pkgs/development/python-modules/uncertainties/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix
index e60ed958223b..d90ada606321 100644
--- a/pkgs/development/python-modules/uncertainties/default.nix
+++ b/pkgs/development/python-modules/uncertainties/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "uncertainties";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4";
+    sha256 = "91db922d54dff6094b4ea0d6e058f713a992cdf42e3ebaf73278e1893bfa2942";
   };
 
   buildInputs = [ nose numpy ];

From 538edfbb9b1d519c0a35881b58a74079f686d412 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:00:28 +0100
Subject: [PATCH 075/104] python: yapf: 0.20.0 -> 0.20.1

---
 pkgs/development/python-modules/yapf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index d7617ae1551b..05913ab61c5e 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "yapf";
-  version = "0.20.0";
+  version = "0.20.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ff28f8839a9a105854a099026a33f4cbec8bd933554bfed658aec359bfc88ae8";
+    sha256 = "bd19f246be7193ad2acdc04702b92315f1ae28d49c82f6671afdeefe9d32f468";
   };
 
   meta = with stdenv.lib; {

From a6ae893054c6cd154140373ab3f69e70da32e6a2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:00:33 +0100
Subject: [PATCH 076/104] python: yarl: 0.17.0 -> 1.0.0

---
 pkgs/development/python-modules/yarl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index cf95803d5af4..fe6b806ab717 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "yarl";
-  version = "0.17.0";
+  version = "1.0.0";
   name = "${pname}-${version}";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2e4e1aec650ad80e73e7063941cd8aadb48e72487ec680a093ad364cc61efe64";
+    sha256 = "5ea610467a04d99bfc8878186330b28859eafc6ca589cdd24ba6fb7234c4b011";
   };
 
   checkInputs = [ pytest pytestrunner ];

From e3865944f6ab65a3f795dec3f1fd8a3e6bffe6d8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:18:00 +0100
Subject: [PATCH 077/104] awscli: 1.14.22 -> 1.4.29

---
 pkgs/tools/admin/awscli/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index fa9bcebdee15..bad9ccae799d 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -18,20 +18,20 @@ let
     name = "${pname}-${version}";
     pname = "colorama";
     version = "0.3.7";
-    src = fetchPypi {
-      inherit pname version;
+    src = old.src.override {
+      inherit version;
       sha256 = "0avqkn6362v7k2kg3afb35g4sfdvixjgy890clip4q174p9whhz0";
     };
   });
 
 in buildPythonPackage rec {
   pname = "awscli";
-  version = "1.14.22";
+  version = "1.14.29";
   namePrefix = "";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "13pivyyivwb3xy0l45083gcman2b0xiv00fl9ww0m8jccgxsdzd0";
+    sha256 = "96edb1dd72fbc13638967fe07c436e95133169759cc962b973bb79ba959bc652";
   };
 
   # No tests included

From f72a465e84c8aed5639533d2309c4ace577b27a1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:25:56 +0100
Subject: [PATCH 078/104] CPython and PyPy: update meta.maintainers

---
 pkgs/development/interpreters/python/cpython/2.7/default.nix | 2 +-
 pkgs/development/interpreters/python/cpython/3.4/default.nix | 2 +-
 pkgs/development/interpreters/python/cpython/3.5/default.nix | 2 +-
 pkgs/development/interpreters/python/cpython/3.6/default.nix | 2 +-
 pkgs/development/interpreters/python/pypy/2.7/default.nix    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 9352bb4d52e0..1cb739b4d29f 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -227,7 +227,7 @@ in stdenv.mkDerivation {
       '';
       license = stdenv.lib.licenses.psfl;
       platforms = stdenv.lib.platforms.all;
-      maintainers = with stdenv.lib.maintainers; [ chaoflow domenkozar ];
+      maintainers = with stdenv.lib.maintainers; [ fridh ];
       # Higher priority than Python 3.x so that `/bin/python` points to `/bin/python2`
       # in case both 2 and 3 are installed.
       priority = -100;
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 5c13035be1b1..2e8a95e7329b 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -185,6 +185,6 @@ in stdenv.mkDerivation {
     '';
     license = licenses.psfl;
     platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ chaoflow domenkozar cstrahan ];
+    maintainers = with maintainers; [ fridh ];
   };
 }
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 951cb367528f..eb8d0a2df38e 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -178,6 +178,6 @@ in stdenv.mkDerivation {
     '';
     license = licenses.psfl;
     platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ chaoflow domenkozar cstrahan ];
+    maintainers = with maintainers; [ fridh ];
   };
 }
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index d5ac94c76e6b..f48f2c19026c 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -178,6 +178,6 @@ in stdenv.mkDerivation {
     '';
     license = licenses.psfl;
     platforms = with platforms; linux ++ darwin;
-    maintainers = with maintainers; [ chaoflow domenkozar cstrahan kragniz ];
+    maintainers = with maintainers; [ fridh kragniz ];
   };
 }
diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix
index 2b9c3f5958b8..1bce746f3c2d 100644
--- a/pkgs/development/interpreters/python/pypy/2.7/default.nix
+++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix
@@ -139,6 +139,6 @@ in stdenv.mkDerivation rec {
     description = "Fast, compliant alternative implementation of the Python language (2.7.13)";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ ];
   };
 }

From b47ff5905f993efe74d8fe51ae065c8b540dc78c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:26:26 +0100
Subject: [PATCH 079/104] python.pkgs.sqlalchemy: use current pytest

---
 pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 35140f2822de..175aa4a6c3ab 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -1,7 +1,7 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, pytest_30
+, pytest
 , mock
 , pytest_xdist
 , isPy3k
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   };
 
   checkInputs = [
-    pytest_30
+    pytest
     mock
 #     Disable pytest_xdist tests for now, because our version seems to be too new.
 #     pytest_xdist

From c0c616b81f58e649d8c1ed3452c60fd99da73ee2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:27:13 +0100
Subject: [PATCH 080/104] python.pkgs.pytest_30: remove unused version

---
 .../development/python-modules/pytest/3_0.nix | 27 -------------------
 pkgs/top-level/python-packages.nix            |  8 ------
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pytest/3_0.nix

diff --git a/pkgs/development/python-modules/pytest/3_0.nix b/pkgs/development/python-modules/pytest/3_0.nix
deleted file mode 100644
index 487fe1b73c76..000000000000
--- a/pkgs/development/python-modules/pytest/3_0.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py
-, setuptools_scm
-}:
-buildPythonPackage rec {
-  version = "3.0.7";
-  pname = "pytest";
-  name = "${pname}-${version}";
-
-  preCheck = ''
-    # don't test bash builtins
-    rm testing/test_argcomplete.py
-  '';
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab";
-  };
-
-  buildInputs = [ hypothesis setuptools_scm ];
-  propagatedBuildInputs = [ py ]
-    ++ (stdenv.lib.optional isPy26 argparse);
-
-  meta = with stdenv.lib; {
-    maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
-    platforms = platforms.unix;
-  };
-}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index be2d2fbede44..a406b655c9f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3251,14 +3251,6 @@ in {
 
   pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};
 
-  pytest_30 = callPackage ../development/python-modules/pytest/3_0.nix {
-    hypothesis = self.hypothesis.override {
-      # hypothesis requires pytest that causes dependency cycle
-      doCheck = false;
-      pytest = null;
-    };
-  };
-
   pytest_32 = callPackage ../development/python-modules/pytest/3_2.nix{
     hypothesis = self.hypothesis.override {
       # hypothesis requires pytest that causes dependency cycle

From 29e96089491f706cb5f9e7083ef5b94422f174d3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:42:24 +0100
Subject: [PATCH 081/104] python.pkgs.PyLTI: move expression

---
 .../python-modules/pylti/default.nix          | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 30 +----------
 2 files changed, 52 insertions(+), 29 deletions(-)
 create mode 100644 pkgs/development/python-modules/pylti/default.nix

diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix
new file mode 100644
index 000000000000..751d9e300e51
--- /dev/null
+++ b/pkgs/development/python-modules/pylti/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, httplib2
+, oauth
+, oauth2
+, semantic-version
+, flask
+, httpretty
+, oauthlib
+, pyflakes
+, pytest_27
+, pytestcache
+, pytestcov
+, covCore
+, pytestflakes
+, pytestpep8
+, sphinx
+, mock
+, isPy27
+}:
+
+buildPythonPackage rec {
+  pname = "PyLTI";
+  version = "0.4.1";
+
+  disabled = !isPy27;
+
+  # There is no need to fix mock. https://github.com/mitodl/pylti/pull/48
+  postPatch = ''
+    substituteInPlace setup.py --replace "mock==1.0.1" "mock"
+  '';
+
+  propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ];
+  checkInputs = [
+    flask httpretty oauthlib pyflakes pytest_27 pytestcache pytestcov covCore
+    pytestflakes pytestpep8 sphinx mock
+  ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "076llj10j85zw3zq2gygx2pcfqi9rgcld5m4vq1iai1fk15x60fz";
+  };
+
+  meta = {
+    description = "Implementation of IMS LTI interface that works with edX";
+    homepage = "https://github.com/mitodl/pylti";
+    license = lib.licenses.bsdOriginal;
+    maintainers = with lib.maintainers; [ layus ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a406b655c9f1..728e569c0ad3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5621,35 +5621,7 @@ in {
     };
   };
 
-  PyLTI = buildPythonPackage rec {
-    version = "0.4.1";
-    name = "PyLTI-${version}";
-
-    disabled = !isPy27;
-
-    # There is no need to fix mock. https://github.com/mitodl/pylti/pull/48
-    postPatch = ''
-      substituteInPlace setup.py --replace "mock==1.0.1" "mock"
-    '';
-
-    propagatedBuildInputs = with self; [ httplib2 oauth oauth2 semantic-version ];
-    buildInputs = with self; [
-      flask httpretty oauthlib pyflakes pytest_27 pytestcache pytestcov covCore
-      pytestflakes pytestpep8 sphinx mock
-    ];
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/P/PyLTI/${name}.tar.gz";
-      sha256 = "076llj10j85zw3zq2gygx2pcfqi9rgcld5m4vq1iai1fk15x60fz";
-    };
-
-    meta = {
-      description = "Implementation of IMS LTI interface that works with edX";
-      homepage = "https://github.com/mitodl/pylti";
-      license = licenses.bsdOriginal;
-      maintainers = with maintainers; [ layus ];
-    };
-  };
+  PyLTI = callPackage ../development/python-modules/pylti { };
 
   lmdb = buildPythonPackage rec {
     pname = "lmdb";

From e2f041a65bda0d78f76e4639cad03cd008fc8dfd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:47:22 +0100
Subject: [PATCH 082/104] python.pkgs.PyLTI: 0.4.1 -> 0.5.1

---
 pkgs/development/python-modules/pylti/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pylti/default.nix b/pkgs/development/python-modules/pylti/default.nix
index 751d9e300e51..8d61c2bf9e98 100644
--- a/pkgs/development/python-modules/pylti/default.nix
+++ b/pkgs/development/python-modules/pylti/default.nix
@@ -9,7 +9,7 @@
 , httpretty
 , oauthlib
 , pyflakes
-, pytest_27
+, pytest
 , pytestcache
 , pytestcov
 , covCore
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "PyLTI";
-  version = "0.4.1";
+  version = "0.5.1";
 
   disabled = !isPy27;
 
@@ -33,13 +33,13 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ httplib2 oauth oauth2 semantic-version ];
   checkInputs = [
-    flask httpretty oauthlib pyflakes pytest_27 pytestcache pytestcov covCore
+    flask httpretty oauthlib pyflakes pytest pytestcache pytestcov covCore
     pytestflakes pytestpep8 sphinx mock
   ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "076llj10j85zw3zq2gygx2pcfqi9rgcld5m4vq1iai1fk15x60fz";
+    sha256 = "32093d961bf95e508bf27667289155da1e082ed9989bb84a76c54c6974c941e1";
   };
 
   meta = {

From 3fa97029584ce2cdc3136539fb9e6e99c21f9b9a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:48:04 +0100
Subject: [PATCH 083/104] python.pkgs.pytest_27: remove old version

---
 .../development/python-modules/pytest/2_7.nix | 30 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pytest/2_7.nix

diff --git a/pkgs/development/python-modules/pytest/2_7.nix b/pkgs/development/python-modules/pytest/2_7.nix
deleted file mode 100644
index e63c3f5ebbd6..000000000000
--- a/pkgs/development/python-modules/pytest/2_7.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }:
-buildPythonPackage rec {
-  pname = "pytest";
-  version = "2.7.3";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/p/pytest/${name}.tar.gz";
-    sha256 = "1z4yi986f9n0p8qmzmn21m21m8j1x78hk3505f89baqm6pdw7afm";
-  };
-
-  # Disabled temporarily because of Hydra issue with namespaces
-  doCheck = false;
-
-  preCheck = ''
-    # don't test bash builtins
-    rm testing/test_argcomplete.py
-  '';
-
-  propagatedBuildInputs = [ py ]
-    ++ (stdenv.lib.optional isPy26 argparse)
-    ++ stdenv.lib.optional
-      pkgs.config.pythonPackages.pytest.selenium or false
-      selenium;
-
-  meta = with stdenv.lib; {
-    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 728e569c0ad3..d7f204f324cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3245,8 +3245,6 @@ in {
 
   pytest = self.pytest_33;
 
-  pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {};
-
   pytest_28 = callPackage ../development/python-modules/pytest/2_8.nix {};
 
   pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};

From 24e2e6d67dafd346ac19523de1345ef130a9cd7d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:53:27 +0100
Subject: [PATCH 084/104] python.pkgs.keyring: use current pytest

---
 pkgs/development/python-modules/keyring/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix
index 29b426ac1ee4..0f99152766a3 100644
--- a/pkgs/development/python-modules/keyring/default.nix
+++ b/pkgs/development/python-modules/keyring/default.nix
@@ -1,7 +1,7 @@
 { stdenv, buildPythonPackage, fetchPypi
 , secretstorage
 , fs, gdata, python_keyczar, pyasn1, pycrypto, six, setuptools_scm
-, mock, pytest_28, pytestrunner }:
+, mock, pytest, pytestrunner }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     fs gdata python_keyczar pyasn1 pycrypto six setuptools_scm
   ];
 
-  checkInputs = [ mock pytest_28 pytestrunner ];
+  checkInputs = [ mock pytest pytestrunner ];
 
   propagatedBuildInputs = [ secretstorage ];
 

From e3581626ef8c31d5a3d31a82135f8bc6e5c2444a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:53:46 +0100
Subject: [PATCH 085/104] python.pkgs.secp256k1: move expression

---
 .../python-modules/secp256k1/default.nix      | 44 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 35 +--------------
 2 files changed, 46 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/development/python-modules/secp256k1/default.nix

diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix
new file mode 100644
index 000000000000..796ac0ff92df
--- /dev/null
+++ b/pkgs/development/python-modules/secp256k1/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pkgconfig
+, pytest_28
+, pytestrunner
+, cffi
+, secp256k1
+}:
+
+buildPythonPackage rec {
+  pname = "secp256k1";
+  version = "0.12.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0zrjxvzxqm4bz2jcy8sras8jircgbs6dkrw8j3nc6jhvzlikwwxl";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ pytest_28 pytestrunner ];
+  propagatedBuildInputs = [ cffi secp256k1 ];
+
+  # Tests are not included in archive
+  doCheck = false;
+
+  preConfigure = ''
+    cp -r ${secp256k1.src} libsecp256k1
+    touch libsecp256k1/autogen.sh
+    export INCLUDE_DIR=${secp256k1}/include
+    export LIB_DIR=${secp256k1}/lib
+  '';
+
+  checkPhase = ''
+    py.test tests
+  '';
+
+  meta = {
+    homepage = https://github.com/ludbb/secp256k1-py;
+    description = "Python FFI bindings for secp256k1";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ chris-martin ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d7f204f324cd..39c3ebdf4083 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16746,39 +16746,8 @@ in {
     };
   };
 
-  secp256k1 = buildPythonPackage rec {
-    name = "secp256k1-${version}";
-    version = "0.12.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/secp256k1/${name}.tar.gz";
-      sha256 = "0zrjxvzxqm4bz2jcy8sras8jircgbs6dkrw8j3nc6jhvzlikwwxl";
-    };
-
-    nativeBuildInputs = [ pkgs.pkgconfig ];
-    buildInputs = [ self.pytest_28 self.pytestrunner ];
-    propagatedBuildInputs = [ self.cffi pkgs.secp256k1 ];
-
-    # Tests are not included in archive
-    doCheck = false;
-
-    preConfigure = ''
-      cp -r ${pkgs.secp256k1.src} libsecp256k1
-      touch libsecp256k1/autogen.sh
-      export INCLUDE_DIR=${pkgs.secp256k1}/include
-      export LIB_DIR=${pkgs.secp256k1}/lib
-    '';
-
-    checkPhase = ''
-      py.test tests
-    '';
-
-    meta = {
-      homepage = https://github.com/ludbb/secp256k1-py;
-      description = "Python FFI bindings for secp256k1";
-      license = with licenses; [ mit ];
-      maintainers = with maintainers; [ chris-martin ];
-    };
+  secp256k1 = callPackage ../development/python-modules/secp256k1 {
+    inherit (pkgs) secp256k1 pkgconfig;
   };
 
   semantic-version = callPackage ../development/python-modules/semantic-version { };

From 2c3c847d64dfe458d81bcb51afebdecaa4ad0cb5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:54:40 +0100
Subject: [PATCH 086/104] python.pkgs.secp256k1: use current pytest

---
 pkgs/development/python-modules/secp256k1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix
index 796ac0ff92df..4fcea8248005 100644
--- a/pkgs/development/python-modules/secp256k1/default.nix
+++ b/pkgs/development/python-modules/secp256k1/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pkgconfig
-, pytest_28
+, pytest
 , pytestrunner
 , cffi
 , secp256k1
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ pytest_28 pytestrunner ];
+  checkInputs = [ pytest pytestrunner ];
   propagatedBuildInputs = [ cffi secp256k1 ];
 
   # Tests are not included in archive

From 56c3535d067b78c00957fb16ebdc91e96930195f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:55:44 +0100
Subject: [PATCH 087/104] python.pkgs.pytest_28: remove old version

---
 .../development/python-modules/pytest/2_8.nix | 30 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pytest/2_8.nix

diff --git a/pkgs/development/python-modules/pytest/2_8.nix b/pkgs/development/python-modules/pytest/2_8.nix
deleted file mode 100644
index 963154b11ce1..000000000000
--- a/pkgs/development/python-modules/pytest/2_8.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }:
-buildPythonPackage rec {
-  pname = "pytest";
-  version = "2.8.7";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/p/pytest/${name}.tar.gz";
-    sha256 = "1bwb06g64x2gky8x5hcrfpg6r351xwvafimnhm5qxq7wajz8ck7w";
-  };
-
-  # Disabled temporarily because of Hydra issue with namespaces
-  doCheck = false;
-
-  preCheck = ''
-    # don't test bash builtins
-    rm testing/test_argcomplete.py
-  '';
-
-  propagatedBuildInputs = [ py ]
-    ++ (stdenv.lib.optional isPy26 argparse)
-    ++ stdenv.lib.optional
-      pkgs.config.pythonPackages.pytest.selenium or false
-      selenium;
-
-  meta = with stdenv.lib; {
-    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39c3ebdf4083..6cd94286add2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3245,8 +3245,6 @@ in {
 
   pytest = self.pytest_33;
 
-  pytest_28 = callPackage ../development/python-modules/pytest/2_8.nix {};
-
   pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};
 
   pytest_32 = callPackage ../development/python-modules/pytest/3_2.nix{

From 6d282fa3b6bf2e3027f3099886f593b84a660a83 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:57:34 +0100
Subject: [PATCH 088/104] python.pkgs.libtmux: fix expression

---
 pkgs/development/python-modules/libtmux/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 57f8d2c8114e..3fe0b3911c26 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -1,7 +1,6 @@
-{ stdenv, fetchPypi, buildPythonPackage, pytest_29 }:
+{ stdenv, fetchPypi, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "libtmux";
   version = "0.7.7";
 
@@ -10,11 +9,14 @@ buildPythonPackage rec {
     sha256 = "5670c8da8d0192d932ac1e34f010e0eeb098cdb2af6daad0307b5418e7a37733";
   };
 
-  buildInputs = [ pytest_29 ];
-  patchPhase = ''
+  checkInputs = [ pytest ];
+  postPatch = ''
     sed -i 's/==.*$//' requirements/test.txt
   '';
 
+  # No tests in archive
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "Scripting library for tmux";
     homepage = https://libtmux.readthedocs.io/;

From ed81943bdef0faee7b798abc8b0473765474f6e4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 12:59:03 +0100
Subject: [PATCH 089/104] python.pkgs.MDP: fix expression

---
 pkgs/development/python-modules/mdp/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix
index 28f6057e5633..9fbaced9b657 100644
--- a/pkgs/development/python-modules/mdp/default.nix
+++ b/pkgs/development/python-modules/mdp/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, buildPythonPackage, fetchPypi, pytest_29, future, numpy }:
+{ stdenv, buildPythonPackage, fetchPypi, pytest, future, numpy }:
 
 buildPythonPackage rec {
   pname = "MDP";
   version = "3.5";
-  name  = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "0aw1zxmyvx6gfmmnixbqmdaah28jl7rmqkzhxv53091asc23iw9k";
   };
 
-  checkInputs = [ pytest_29 ];
+  checkInputs = [ pytest ];
   propagatedBuildInputs = [ future numpy ];
 
   # Tests disabled because of missing dependencies not in nix

From 217626a3e900ad4726237ade5aa46fddbc91484b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 13:01:53 +0100
Subject: [PATCH 090/104] python.pkgs.click-threading: move and fix expression

---
 .../click-threading/default.nix               | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 27 +--------------
 2 files changed, 35 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/python-modules/click-threading/default.nix

diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix
new file mode 100644
index 000000000000..5be41007c6a9
--- /dev/null
+++ b/pkgs/development/python-modules/click-threading/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, click
+, isPy3k
+, futures
+}:
+
+buildPythonPackage rec {
+  pname = "click-threading";
+  version = "0.4.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609";
+  };
+
+  checkInputs = [ pytest ];
+  propagatedBuildInputs = [ click ] ++ lib.optional (!isPy3k) futures;
+
+  checkPhase = ''
+    py.test
+  '';
+
+  # Tests are broken on 3.x
+  doCheck = !isPy3k;
+
+  meta = {
+    homepage = https://github.com/click-contrib/click-threading/;
+    description = "Multithreaded Click apps made easy";
+    license = lib.licenses.mit;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6cd94286add2..9ff86d863ff7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2409,32 +2409,7 @@ in {
 
   click-plugins = callPackage ../development/python-modules/click-plugins {};
 
-  click-threading = buildPythonPackage rec {
-    version = "0.4.2";
-    name = "click-threading-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/c/click-threading/${name}.tar.gz";
-      sha256 = "400b0bb63d9096b6bf2806efaf742a1cc8b6c88e0484f0afe7d7a7f0e9870609";
-    };
-
-    checkInputs = with self; [ pytest_29 ];
-    propagatedBuildInputs = with self; [ click ] ++ optional (!isPy3k) futures;
-
-    checkPhase = ''
-      py.test
-    '';
-
-    # Tests are broken on 3.x
-    doCheck = !isPy3k;
-
-    meta = {
-      homepage = https://github.com/click-contrib/click-threading/;
-      description = "Multithreaded Click apps made easy";
-      license = licenses.mit;
-      maintainers = with maintainers; [ ];
-    };
-  };
+  click-threading = callPackage ../development/python-modules/click-threading {};
 
   cligj = callPackage ../development/python-modules/cligj { };
 

From b4d9aaabda21957cb6cbe263e99ac43496e25873 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 13:14:07 +0100
Subject: [PATCH 091/104] tmuxp: 1.3.4 -> 1.3.5

---
 pkgs/tools/misc/tmuxp/default.nix | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix
index 24486980b4ba..33a4ebd70b37 100644
--- a/pkgs/tools/misc/tmuxp/default.nix
+++ b/pkgs/tools/misc/tmuxp/default.nix
@@ -1,26 +1,29 @@
-{ stdenv, fetchurl, pythonPackages }:
+{ stdenv, fetchurl, python }:
 
-pythonPackages.buildPythonApplication rec {
-  name = "tmuxp-${version}";
-  version = "1.3.4";
+with python.pkgs;
 
-  namePrefix = "";
+buildPythonApplication rec {
+  pname = "tmuxp";
+  version = "1.3.5";
 
-  src = fetchurl {
-    url = "mirror://pypi/t/tmuxp/${name}.tar.gz";
-    sha256 = "149n35rr27n2c6yna1bla20x3w1zz9gxnjj3m3xxdfp4fbsd2y31";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "bdbbbf5980d6ec21838396a46cd5b599787e8540782b8e2e3f20d2135560a5d3";
   };
 
-  patchPhase = ''
+  postPatch = ''
     sed -i 's/==.*$//' requirements/base.txt requirements/test.txt
   '';
 
-  buildInputs = with pythonPackages; [
-    pytest_29
+  checkInputs = [
+    pytest
     pytest-rerunfailures
   ];
 
-  propagatedBuildInputs = with pythonPackages; [
+  # No tests in archive
+  doCheck = false;
+
+  propagatedBuildInputs = [
     click colorama kaptan libtmux
   ];
 

From 1623c8371c48a50ff8a4adeace47fe3e1a7c1117 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 13:31:14 +0100
Subject: [PATCH 092/104] buildPythonPackage: rename nix_run_setup.py to
 nix_run_setup

If the extension is .py it tends to be picked up by tools, breaking for
example tests.
---
 .../version-management/nbstripout/default.nix |  2 +-
 .../build-python-package-setuptools.nix       |  8 ++++----
 .../django_guardian/default.nix               |  2 +-
 .../python-modules/intervaltree/default.nix   |  4 +---
 .../python-modules/natsort/default.nix        |  4 +---
 .../python-modules/natsort/setup.patch        | 20 -------------------
 .../python-modules/progressbar2/default.nix   |  2 +-
 .../python-modules/pytest-flake8/default.nix  |  2 +-
 .../python-modules/python-utils/default.nix   |  1 -
 pkgs/tools/backup/borg/default.nix            |  3 ---
 pkgs/top-level/python-packages.nix            |  8 --------
 11 files changed, 10 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/development/python-modules/natsort/setup.patch

diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix
index c3ed61f31a23..c4c09094edd4 100644
--- a/pkgs/applications/version-management/nbstripout/default.nix
+++ b/pkgs/applications/version-management/nbstripout/default.nix
@@ -25,7 +25,7 @@ buildPythonApplication rec {
 
   # ignore flake8 tests for the nix wrapped setup.py
   checkPhase = ''
-    PATH=$PATH:$out/bin:${mercurial}/bin pytest --ignore=nix_run_setup.py .
+    PATH=$PATH:$out/bin:${mercurial}/bin pytest .
   '';
 
   meta = {
diff --git a/pkgs/development/interpreters/python/build-python-package-setuptools.nix b/pkgs/development/interpreters/python/build-python-package-setuptools.nix
index a09febb492b1..bc512357acd5 100644
--- a/pkgs/development/interpreters/python/build-python-package-setuptools.nix
+++ b/pkgs/development/interpreters/python/build-python-package-setuptools.nix
@@ -21,18 +21,18 @@ let
   setuppy = ./run_setup.py;
 
 in attrs // {
-  # we copy nix_run_setup.py over so it's executed relative to the root of the source
+  # we copy nix_run_setup over so it's executed relative to the root of the source
   # many project make that assumption
   buildPhase = attrs.buildPhase or ''
     runHook preBuild
-    cp ${setuppy} nix_run_setup.py
-    ${python.interpreter} nix_run_setup.py ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel
+    cp ${setuppy} nix_run_setup
+    ${python.interpreter} nix_run_setup ${lib.optionalString (setupPyBuildFlags != []) ("build_ext " + (lib.concatStringsSep " " setupPyBuildFlags))} bdist_wheel
     runHook postBuild
   '';
 
   installCheckPhase = attrs.checkPhase or ''
     runHook preCheck
-    ${python.interpreter} nix_run_setup.py test
+    ${python.interpreter} nix_run_setup test
     runHook postCheck
   '';
 
diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix
index a92a7038cd31..d2f8361bc7d6 100644
--- a/pkgs/development/python-modules/django_guardian/default.nix
+++ b/pkgs/development/python-modules/django_guardian/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [ django six ];
 
   checkPhase = ''
-    ${python.interpreter} nix_run_setup.py test --addopts="--ignore build"
+    ${python.interpreter} nix_run_setup test --addopts="--ignore build"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix
index 69b35df29738..feccdff683e7 100644
--- a/pkgs/development/python-modules/intervaltree/default.nix
+++ b/pkgs/development/python-modules/intervaltree/default.nix
@@ -17,10 +17,8 @@ buildPythonPackage rec {
 
   checkPhase = ''
     runHook preCheck
-    # pytest will try to run tests for nix_run_setup.py / files in build/lib which fails
-    mv nix_run_setup.py run_setup
     rm build -rf
-    ${python.interpreter} run_setup test
+    ${python.interpreter} nix_run_setup test
     runHook postCheck
   '';
 
diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index 4fc1f7255c60..8e81f923b916 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -39,9 +39,7 @@ buildPythonPackage rec {
     sha256 = "9ffbfb74bf3fc3905be1b9b052ed865675651e38fcd972ed1ed5c64a02f93cbd";
   };
 
-  # do not run checks on nix_run_setup.py
-  patches = lib.singleton ./setup.patch
-         ++ lib.optional (isPy35 || isPy36) ./python-3.6.3-test-failures.patch;
+  patches = lib.optional (isPy35 || isPy36) ./python-3.6.3-test-failures.patch;
 
   # testing based on project's tox.ini
   checkPhase = ''
diff --git a/pkgs/development/python-modules/natsort/setup.patch b/pkgs/development/python-modules/natsort/setup.patch
deleted file mode 100644
index 4c52b740152c..000000000000
--- a/pkgs/development/python-modules/natsort/setup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/setup.cfg b/setup.cfg
-index 604994d..e38c3ec 100644
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -6,6 +6,7 @@ formats = gztar
- 
- [tool:pytest]
- flakes-ignore = 
-+	nix_run_setup.py ALL
- 	natsort/compat/py23.py UndefinedName
- 	natsort/__init__.py UnusedImport
- 	natsort/compat/* UnusedImport
-@@ -14,6 +15,7 @@ flakes-ignore =
- 	test_natsort/test_locale_help.py UnusedImport RedefinedWhileUnused
- 	test_natsort/compat/* UnusedImport
- pep8ignore = 
-+	nix_run_setup.py ALL
- 	natsort/ns_enum.py E126 E241 E123 E221
- 	test_natsort/test_*.py E501 E241 E221
- 	test_natsort/test_natsort_keygen.py E501 E241 E221 E701
diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
index 214f81ef0de3..7721ca4e5ca5 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/pkgs/development/python-modules/progressbar2/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
   # ignore tests on the nix wrapped setup.py and don't flake .eggs directory
   checkPhase = ''
     runHook preCheck
-    ${python.interpreter} setup.py test --addopts "--ignore=nix_run_setup.py --ignore=.eggs"
+    ${python.interpreter} setup.py test --addopts "--ignore=.eggs"
     runHook postCheck
   '';
 
diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix
index 2b615e5820e9..d79f32a67662 100644
--- a/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/pkgs/development/python-modules/pytest-flake8/default.nix
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   };
 
   checkPhase = ''
-    pytest --ignore=nix_run_setup.py .
+    pytest .
   '';
 
   meta = {
diff --git a/pkgs/development/python-modules/python-utils/default.nix b/pkgs/development/python-modules/python-utils/default.nix
index a7826758af05..654b851b6635 100644
--- a/pkgs/development/python-modules/python-utils/default.nix
+++ b/pkgs/development/python-modules/python-utils/default.nix
@@ -23,7 +23,6 @@ buildPythonPackage rec {
   doCheck = false;
 
   checkPhase = ''
-    rm nix_run_setup.py
     py.test
   '';
 
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 19b375137e48..eb40dfefb83c 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -41,9 +41,6 @@ python3Packages.buildPythonApplication rec {
     cp -R docs/_build/man $out/share/man/man1
   '';
 
-  # tests fail due to missing test command in nix_run_setup.py
-  doCheck = false;
-
   meta = with stdenv.lib; {
     description = "A deduplicating backup program (attic fork)";
     homepage = https://borgbackup.github.io/;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9ff86d863ff7..2c42031cbc14 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10767,14 +10767,6 @@ in {
     ];
     LC_ALL = "en_US.UTF-8";
 
-    # Remove test that fails due to missing encoding in nix_run_setup.py, a
-    # file that buildPythonPackage copies to source trees at build time.
-    # PR with fix: https://github.com/NixOS/nixpkgs/pull/17430
-    # ("python: add file encoding to run_setup.py")
-    preBuild = ''
-      rm tests/test_encoding.py
-    '';
-
     meta = {
       description = "Python multimedia tagging library";
       homepage = http://code.google.com/p/mutagen;

From ee8f15ec7c1f9115243248c374918b9cd4f06d16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 17 Jan 2018 11:46:27 +0100
Subject: [PATCH 093/104] pythonPackages.pytestrunner: 2.6.2 -> 3.0

Also add missing dependency to progressbar2
---
 .../python-modules/progressbar2/default.nix   |  2 ++
 .../python-modules/pytestrunner/default.nix   | 19 +++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +------------------
 3 files changed, 22 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/pytestrunner/default.nix

diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix
index 7721ca4e5ca5..212c06cc9421 100644
--- a/pkgs/development/python-modules/progressbar2/default.nix
+++ b/pkgs/development/python-modules/progressbar2/default.nix
@@ -14,6 +14,7 @@
 , pytestcov
 , pytestcache
 , pep8
+, pytestrunner
 }:
 
 buildPythonPackage rec {
@@ -30,6 +31,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ python-utils ];
+  nativeBuildInputs = [ pytestrunner ];
   checkInputs = [
     pytest sphinx coverage execnet flake8 pytestpep8 pytestflakes pytestcov
     pytestcache pep8
diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix
new file mode 100644
index 000000000000..67af195b68a6
--- /dev/null
+++ b/pkgs/development/python-modules/pytestrunner/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, buildPythonPackage, fetchPypi, setuptools_scm, pytest }:
+
+buildPythonPackage rec {
+  pname = "pytest-runner";
+  version = "3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "00v7pi09q60yx0l1kzyklnmr5bp597mir85a9gsi7bdfyly3lz0g";
+  };
+
+  buildInputs = [ setuptools_scm pytest ];
+
+  meta = with stdenv.lib; {
+    description = "Invoke py.test as distutils command with dependency resolution";
+    homepage = https://bitbucket.org/pytest-dev/pytest-runner;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c42031cbc14..63ce08a1396a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3424,26 +3424,7 @@ in {
     };
   };
 
-  pytestrunner = buildPythonPackage rec {
-    version = "2.6.2";
-    name = "pytest-runner-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pytest-runner/${name}.tar.gz";
-      sha256 = "e775a40ee4a3a1d45018b199c44cc20bbe7f3df2dc8882f61465bb4141c78cdb";
-    };
-
-    buildInputs = with self; [setuptools_scm pytest];
-
-    meta = {
-      description = "Invoke py.test as distutils command with dependency resolution";
-      homepage = https://bitbucket.org/pytest-dev/pytest-runner;
-      license = licenses.mit;
-    };
-
-    # Trying to run tests fails with # RuntimeError: dictionary changed size during iteration
-    doCheck = false;
-  };
+  pytestrunner = callPackage ../development/python-modules/pytestrunner { };
 
   pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { };
 

From c44d5153abd608ecd05df8ec5dd7426cc7ce9dbe Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 11 Jan 2018 19:53:42 +0100
Subject: [PATCH 094/104] curtsies: don't set name attribute anymore

---
 pkgs/development/python-modules/curtsies/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix
index a1e5f2352356..d9505b384af8 100644
--- a/pkgs/development/python-modules/curtsies/default.nix
+++ b/pkgs/development/python-modules/curtsies/default.nix
@@ -3,8 +3,6 @@
 buildPythonPackage rec {
   pname = "curtsies";
   version = "0.2.11";
-  name  = "${pname}-${version}";
-
   src = fetchPypi {
     inherit pname version;
     sha256 = "1vljmw3sy6lrqahhpyg4gk13mzcx3mwhvg8s41698ms3cpgkjipc";

From cddfa945cb893b9302ddee2517e3d1fc1b69532f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 11 Jan 2018 19:57:24 +0100
Subject: [PATCH 095/104] guzzle_sphinx_theme: don't set name attribute anymore

---
 .../development/python-modules/guzzle_sphinx_theme/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
index e0b36de56729..08b42b807999 100644
--- a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
+++ b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix
@@ -1,11 +1,8 @@
 { stdenv, buildPythonPackage, sphinx, fetchPypi }:
 
-
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "guzzle_sphinx_theme";
   version = "0.7.11";
-
   src = fetchPypi {
     inherit pname version;
     sha256 = "1rnkzrrsbnifn3vsb4pfaia3nlvgvw6ndpxp7lzjrh23qcwid34v";

From 79745a0fbfcab370c98ae8fac78255796739fce3 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 11 Jan 2018 19:58:43 +0100
Subject: [PATCH 096/104] pyte: don't set name attribute anymore

---
 pkgs/development/python-modules/pyte/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix
index 2bd710705815..ed408feec811 100644
--- a/pkgs/development/python-modules/pyte/default.nix
+++ b/pkgs/development/python-modules/pyte/default.nix
@@ -3,8 +3,6 @@
 buildPythonPackage rec {
   pname = "pyte";
   version = "0.7.0";
-  name  = "${pname}-${version}";
-
   src = fetchPypi {
     inherit pname version;
     sha256 = "1an54hvyjm8gncx8cgabz9mkpgjkdb0bkyjlkh7g7f94nr3wnfl7";

From 567cf47d49a97a19024d848bb1c55816b2cdd382 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 11 Jan 2018 19:59:48 +0100
Subject: [PATCH 097/104] twilio: don't set name attribute anymore

---
 pkgs/development/python-modules/twilio/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index faca6edace5e..5a32a64c2962 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -4,8 +4,6 @@
 buildPythonPackage rec {
   pname = "twilio";
   version = "6.8.0";
-  name = "${pname}-${version}";
-
   # tests not included in PyPi, so fetch from github instead
   src = fetchFromGitHub {
     owner = "twilio";

From 5f03d6bf4d19714fec880729b946110799dd39db Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 11 Jan 2018 20:54:20 +0100
Subject: [PATCH 098/104] afew: rewrite expression

it's an application, not a python module

Also, remove name attribute.
Build with python 3 by default.

afew: make setuptools_scm a buildInput

afew: don't set SETUPTOOLS_SCM_PRETEND_VERSION anymore

we fetch from pypi, with version info properly set, so this shouldn't be
an issue.

afew: set license

afew: add notmuch binary to PATH

it seems afew calls "notmuch new" in MailMover.py

afew: don't set LD_LIBRARY_PATH

the library is already hardcoded pythonPackages.notmuch's globals.py
---
 .../networking/mailreaders/afew/default.nix   | 28 +++++++++++++++
 .../python-modules/afew/default.nix           | 34 -------------------
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/python-packages.nix            |  2 --
 4 files changed, 30 insertions(+), 36 deletions(-)
 create mode 100644 pkgs/applications/networking/mailreaders/afew/default.nix
 delete mode 100644 pkgs/development/python-modules/afew/default.nix

diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix
new file mode 100644
index 000000000000..7fbdf0f6a64c
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/afew/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, pythonPackages, notmuch }:
+
+pythonPackages.buildPythonApplication rec {
+  pname = "afew";
+  version = "1.2.0";
+
+  src = pythonPackages.fetchPypi {
+    inherit pname version;
+    sha256 = "121w7bd53xyibllxxbfykjj76n81kn1vgjqd22izyh67y8qyyk5r";
+  };
+
+  buildInputs = with pythonPackages; [ setuptools_scm ];
+
+  propagatedBuildInputs = with pythonPackages; [
+    pythonPackages.notmuch chardet
+  ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32;
+
+  makeWrapperArgs = [
+    ''--prefix PATH ':' "${notmuch}/bin"''
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/afewmail/afew;
+    description = "An initial tagging script for notmuch mail";
+    license = licenses.isc;
+    maintainers = with maintainers; [ garbas andir flokli ];
+  };
+}
diff --git a/pkgs/development/python-modules/afew/default.nix b/pkgs/development/python-modules/afew/default.nix
deleted file mode 100644
index ca00477d4086..000000000000
--- a/pkgs/development/python-modules/afew/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
-, isPy3k , setuptools_scm, notmuch, chardet, subprocess32 }:
-
-buildPythonPackage rec {
-  pname = "afew";
-  version = "1.2.0";
-  name = "${pname}-${version}";
-
-  src = fetchFromGitHub {
-    owner = "afewmail";
-    repo = "afew";
-    rev = "3405475276a2433e1238be330e538ebf2a976e5e";
-    sha256 = "1h974avnfc6636az130yjqwm28z3aaqm49bjhpy3razx6zvyhzlf";
-  };
-
-  buildInputs = [ setuptools_scm ];
-  SETUPTOOLS_SCM_PRETEND_VERSION = "${version}";
-
-  propagatedBuildInputs = [
-    notmuch
-    chardet
-  ] ++ stdenv.lib.optional (!isPy3k) subprocess32;
-
-  postInstall = ''
-    wrapProgram $out/bin/afew \
-      --prefix LD_LIBRARY_PATH : ${notmuch}/lib
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/afewmail/afew;
-    description = "An initial tagging script for notmuch mail";
-    maintainers = with maintainers; [ garbas andir flokli ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd8a7553b182..f3d4f151ff36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -414,6 +414,8 @@ with pkgs;
 
   aescrypt = callPackage ../tools/misc/aescrypt { };
 
+  afew = callPackage ../applications/networking/mailreaders/afew { pythonPackages = python3Packages; };
+
   afio = callPackage ../tools/archivers/afio { };
 
   afl = callPackage ../tools/security/afl {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 63ce08a1396a..fce71ec752bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -390,8 +390,6 @@ in {
 
   adal = callPackage ../development/python-modules/adal { };
 
-  afew = callPackage ../development/python-modules/afew { };
-
   aiodns = callPackage ../development/python-modules/aiodns { };
 
   aiofiles = callPackage ../development/python-modules/aiofiles { };

From 70c200a9529e1119072a6c34547dc4f07a813f8b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 11 Jan 2018 19:46:24 +0100
Subject: [PATCH 099/104] bpython: don't set name attribute anymore

---
 pkgs/development/python-modules/bpython/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix
index 515494b5f931..8fa99ade9c2f 100644
--- a/pkgs/development/python-modules/bpython/default.nix
+++ b/pkgs/development/python-modules/bpython/default.nix
@@ -3,8 +3,6 @@
 buildPythonPackage rec {
   pname = "bpython";
   version = "0.17";
-  name  = "${pname}-${version}";
-
   # 0.17 is still missing on PyPI, https://github.com/bpython/bpython/issues/706
   src = fetchurl {
     url = "https://bpython-interpreter.org/releases/${pname}-${version}.tar.gz";

From 75c2a7677368eba3cd78304faae81a1454ff7817 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 14:09:53 +0100
Subject: [PATCH 100/104] python.pkgs.xvfbwrapper: add missing test dependency

---
 pkgs/development/python-modules/xvfbwrapper/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix
index 0758baacff8a..4ba9cd61d4c5 100644
--- a/pkgs/development/python-modules/xvfbwrapper/default.nix
+++ b/pkgs/development/python-modules/xvfbwrapper/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , xorgserver
+, mock
 }:
 
 buildPythonPackage rec {
@@ -14,6 +15,8 @@ buildPythonPackage rec {
   };
   propagatedBuildInputs = [ xorgserver ];
 
+  checkInputs = [ mock ];
+
   meta = with stdenv.lib; {
     description = "Run headless display inside X virtual framebuffer (Xvfb)";
     homepage = https://github.com/cgoldberg/xvfbwrapper;

From 7f77cce9ed5c09f4276c31f73a9b6131962fcce4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 14:11:56 +0100
Subject: [PATCH 101/104] python.pkgs.pytest_29: remove old version

---
 .../development/python-modules/pytest/2_9.nix | 30 -------------------
 pkgs/top-level/python-packages.nix            |  2 --
 2 files changed, 32 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pytest/2_9.nix

diff --git a/pkgs/development/python-modules/pytest/2_9.nix b/pkgs/development/python-modules/pytest/2_9.nix
deleted file mode 100644
index 2d28517441b0..000000000000
--- a/pkgs/development/python-modules/pytest/2_9.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, pkgs, buildPythonPackage, fetchurl, isPy26, argparse, py, selenium }:
-buildPythonPackage rec {
-  pname = "pytest";
-  version = "2.9.2";
-  name = pname + "-" + version;
-
-  src = fetchurl {
-    url = "mirror://pypi/p/pytest/${name}.tar.gz";
-    sha256 = "1n6igbc1b138wx1q5gca4pqw1j6nsyicfxds5n0b5989kaxqmh8j";
-  };
-
-  # Disabled temporarily because of Hydra issue with namespaces
-  doCheck = false;
-
-  preCheck = ''
-    # don't test bash builtins
-    rm testing/test_argcomplete.py
-  '';
-
-  propagatedBuildInputs = [ py ]
-    ++ (stdenv.lib.optional isPy26 argparse)
-    ++ stdenv.lib.optional
-      pkgs.config.pythonPackages.pytest.selenium or false
-      selenium;
-
-  meta = with stdenv.lib; {
-    maintainers = with maintainers; [ domenkozar lovek323 madjar ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fce71ec752bb..efca8123f3a2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3218,8 +3218,6 @@ in {
 
   pytest = self.pytest_33;
 
-  pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};
-
   pytest_32 = callPackage ../development/python-modules/pytest/3_2.nix{
     hypothesis = self.hypothesis.override {
       # hypothesis requires pytest that causes dependency cycle

From ee91c45f89e4f82c73158fcfb10755f081a0cded Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 14:12:39 +0100
Subject: [PATCH 102/104] python.pkgs.pytest_32: remove old version

---
 .../development/python-modules/pytest/3_2.nix | 27 -------------------
 pkgs/top-level/python-packages.nix            |  8 ------
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pytest/3_2.nix

diff --git a/pkgs/development/python-modules/pytest/3_2.nix b/pkgs/development/python-modules/pytest/3_2.nix
deleted file mode 100644
index d7a0b1bdad34..000000000000
--- a/pkgs/development/python-modules/pytest/3_2.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py
-, setuptools_scm, setuptools
-}:
-buildPythonPackage rec {
-  version = "3.2.5";
-  pname = "pytest";
-
-  preCheck = ''
-    # don't test bash builtins
-    rm testing/test_argcomplete.py
-  '';
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81";
-  };
-
-  checkInputs = [ hypothesis ];
-  buildInputs = [ setuptools_scm ];
-  propagatedBuildInputs = [ py setuptools ]
-    ++ (stdenv.lib.optional isPy26 argparse);
-
-  meta = with stdenv.lib; {
-    maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
-    platforms = platforms.unix;
-  };
-}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index efca8123f3a2..c53989671642 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3218,14 +3218,6 @@ in {
 
   pytest = self.pytest_33;
 
-  pytest_32 = callPackage ../development/python-modules/pytest/3_2.nix{
-    hypothesis = self.hypothesis.override {
-      # hypothesis requires pytest that causes dependency cycle
-      doCheck = false;
-      pytest = null;
-    };
-  };
-
   pytest_33 = callPackage ../development/python-modules/pytest/default.nix{
     hypothesis = self.hypothesis.override {
       # hypothesis requires pytest that causes dependency cycle

From 25d1d4944a5e14698b216cabaa8398b25694c15c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 14:51:09 +0100
Subject: [PATCH 103/104] python.pkgs.bleach: relax test requirement

---
 pkgs/development/python-modules/bleach/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
index eafeae0f477c..e4ccb0c92d66 100644
--- a/pkgs/development/python-modules/bleach/default.nix
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -19,6 +19,10 @@ buildPythonPackage rec {
   checkInputs = [ pytest pytestrunner ];
   propagatedBuildInputs = [ six html5lib ];
 
+  postPatch = ''
+    substituteInPlace setup.py --replace ",<3dev" ""
+  '';
+
   meta = {
     description = "An easy, HTML5, whitelisting HTML sanitizer";
     longDescription = ''

From 21a736bb645689301e5b6432130da28f9b615b76 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jan 2018 14:57:20 +0100
Subject: [PATCH 104/104] python.pkgs.secp256k1: 0.12.1 -> 0.13.2

---
 pkgs/development/python-modules/secp256k1/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix
index 4fcea8248005..6b9f00783fd2 100644
--- a/pkgs/development/python-modules/secp256k1/default.nix
+++ b/pkgs/development/python-modules/secp256k1/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "secp256k1";
-  version = "0.12.1";
+  version = "0.13.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zrjxvzxqm4bz2jcy8sras8jircgbs6dkrw8j3nc6jhvzlikwwxl";
+    sha256 = "a3b43e02d321c09eafa769a6fc2c156f555cab3a7db62175ef2fd21e16cdf20c";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -35,6 +35,10 @@ buildPythonPackage rec {
     py.test tests
   '';
 
+  postPatch = ''
+    substituteInPlace setup.py --replace ", 'pytest-runner==2.6.2'" ""
+  '';
+
   meta = {
     homepage = https://github.com/ludbb/secp256k1-py;
     description = "Python FFI bindings for secp256k1";