From 4518b02c8b33c35ec0e483afa83777df69b2aa25 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 20:14:01 +0100
Subject: [PATCH 1/7] simpleeval: init at 0.9.5

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

diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix
new file mode 100644
index 000000000000..cd77f66b56eb
--- /dev/null
+++ b/pkgs/development/python-modules/simpleeval/default.nix
@@ -0,0 +1,16 @@
+{ lib, fetchurl, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "simpleeval-${version}";
+  version = "0.9.5";
+  src = fetchurl {
+    url = "mirror://pypi/s/simpleeval/${name}.tar.gz";
+    sha256 = "0sda13bqg9l4j17iczmfanxbzsg6fm9aw8i3crzsjfxx51rwj1i3";
+  };
+  meta = {
+    homepage = "https://github.com/danthedeckie/simpleeval";
+    description = "A simple, safe single expression evaluator library";
+    maintainers = with lib.maintainers; [ johbo ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4e429ff4c2aa..09e9b1e23345 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -360,6 +360,8 @@ in {
 
   rhpl = if !isPy3k then callPackage ../development/python-modules/rhpl {} else throw "rhpl not supported for interpreter ${python.executable}";
 
+  simpleeval = callPackage ../development/python-modules/simpleeval { };
+
   sip = callPackage ../development/python-modules/sip { };
 
   tables = callPackage ../development/python-modules/tables {

From 402a6c6dde53f2997a5c6678c069fdf2c98b643f Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 20:31:51 +0100
Subject: [PATCH 2/7] PyWebDAV: init at 0.9.8

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

diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix
new file mode 100644
index 000000000000..27925a619f2f
--- /dev/null
+++ b/pkgs/development/python-modules/pywebdav/default.nix
@@ -0,0 +1,17 @@
+{ lib, fetchurl, buildPythonPackage, isPy3k }:
+
+buildPythonPackage rec {
+  name = "PyWebDAV-${version}";
+  version = "0.9.8";
+  disabled = isPy3k;
+  src = fetchurl {
+    url = "mirror://pypi/p/pywebdav/${name}.tar.gz";
+    sha256 = "1v10vg79h85milnq8w7yd75qq5z6297ywkn9b2kxajldzwqxn3ji";
+  };
+  meta = {
+    homepage = http://code.google.com/p/pywebdav/;
+    description = "WebDAV library including a standalone server for python";
+    maintainers = with lib.maintainers; [ johbo ];
+    license = lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 09e9b1e23345..99a939c9cce4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -354,6 +354,8 @@ in {
     };
   };
 
+  PyWebDAV = callPackage ../development/python-modules/pywebdav { };
+
   pyxml = if !isPy3k then callPackage ../development/python-modules/pyxml{ } else throw "pyxml not supported for interpreter ${python.executable}";
 
   relatorio = callPackage ../development/python-modules/relatorio { };

From 96e1fd6a5a81b24e5f932ee1c2b9bcff17242987 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 20:24:18 +0100
Subject: [PATCH 3/7] python-stdnum: init at 1.5

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

diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix
new file mode 100644
index 000000000000..fe85b7bb0d34
--- /dev/null
+++ b/pkgs/development/python-modules/python-stdnum/default.nix
@@ -0,0 +1,18 @@
+{ lib, fetchurl, buildPythonPackage, isPy3k }:
+
+buildPythonPackage rec {
+  name = "python-stdnum-${version}";
+  version = "1.5";
+  # Failing tests and dependency issue on Py3k
+  disabled = isPy3k;
+  src = fetchurl {
+    url = "mirror://pypi/p/python-stdnum/${name}.tar.gz";
+    sha256 = "0zkkpjy4gc161dkyxjmingjw48glljlqqrl4fh2k5idf0frkvzhh";
+  };
+  meta = {
+    homepage = "http://arthurdejong.org/python-stdnum/";
+    description = "Python module to handle standardized numbers and codes";
+    maintainers = with lib.maintainers; [ johbo ];
+    license = lib.licenses.lgpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99a939c9cce4..57159eedd433 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -334,6 +334,8 @@ in {
 
   python-sql = callPackage ../development/python-modules/python-sql { };
 
+  python-stdnum = callPackage ../development/python-modules/python-stdnum { };
+
   pytimeparse = buildPythonPackage rec {
     pname = "pytimeparse";
     version = "1.1.6";

From c55649ce07848359e97c2ce9ce577b407ff25b8b Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 21:10:05 +0100
Subject: [PATCH 4/7] flake8-debugger: init at 1.4.0

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

diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix
new file mode 100644
index 000000000000..b383c5db0083
--- /dev/null
+++ b/pkgs/development/python-modules/flake8-debugger/default.nix
@@ -0,0 +1,18 @@
+{ lib, fetchurl, buildPythonPackage, flake8, nose }:
+
+buildPythonPackage rec {
+  name = "flake8-debugger-${version}";
+  version = "1.4.0";
+  src = fetchurl {
+    url = "mirror://pypi/f/flake8-debugger/${name}.tar.gz";
+    sha256 = "0chjfa6wvnqjnx778qzahhwvjx1j0rc8ax0ipp5bn70gf47lj62r";
+  };
+  buildInputs = [ nose ];
+  propagatedBuildInputs = [ flake8 ];
+  meta = {
+    homepage = https://github.com/jbkahn/flake8-debugger;
+    description = "ipdb/pdb statement checker plugin for flake8";
+    maintainers = with lib.maintainers; [ johbo ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 57159eedd433..1d0e5a525180 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11337,6 +11337,8 @@ in {
     };
   };
 
+  flake8-debugger = callPackage ../development/python-modules/flake8-debugger { };
+
   flaky = buildPythonPackage rec {
     name = "flaky-${version}";
     version = "3.1.0";

From 87b9ee7680d1d991749377d4b76e15dfd01a0315 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 21:16:39 +0100
Subject: [PATCH 5/7] flake8-blind-except: init at 0.1.1

---
 .../flake8-blind-except/default.nix              | 16 ++++++++++++++++
 pkgs/top-level/python-packages.nix               |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/python-modules/flake8-blind-except/default.nix

diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix
new file mode 100644
index 000000000000..88b4f811e944
--- /dev/null
+++ b/pkgs/development/python-modules/flake8-blind-except/default.nix
@@ -0,0 +1,16 @@
+{ lib, fetchurl, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "flake8-blind-except-${version}";
+  version = "0.1.1";
+  src = fetchurl {
+    url = "mirror://pypi/f/flake8-blind-except/${name}.tar.gz";
+    sha256 = "16g58mkr3fcn2vlfhp3rlahj93qswc7jd5qrqp748mc26dk3b8xc";
+  };
+  meta = {
+    homepage = https://github.com/elijahandrews/flake8-blind-except;
+    description = "A flake8 extension that checks for blind except: statements";
+    maintainers = with lib.maintainers; [ johbo ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1d0e5a525180..f881dea71a21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11337,6 +11337,8 @@ in {
     };
   };
 
+  flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { };
+
   flake8-debugger = callPackage ../development/python-modules/flake8-debugger { };
 
   flaky = buildPythonPackage rec {

From 3134afb814597c4dd25c6a3e5b84a066fd1d2700 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Mon, 20 Feb 2017 20:59:32 +0100
Subject: [PATCH 6/7] requests_toolbelt: 0.6.2 -> 0.7.1

---
 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 f881dea71a21..0ed5c5fbe3dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22181,12 +22181,12 @@ in {
   requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { };
 
   requests_toolbelt = buildPythonPackage rec {
-    version = "0.6.2";
+    version = "0.7.1";
     name = "requests-toolbelt-${version}";
 
     src = pkgs.fetchurl {
       url = "https://github.com/sigmavirus24/requests-toolbelt/archive/${version}.tar.gz";
-      sha256 = "0ds1b2qx0nx9bqj1sqgr4lmanb4hpchmylp1hml1l0p71qi5ha0r";
+      sha256 = "16grklnbgcfwqj3f39gw7fc9afi7xlp9gm7x8w6mi81dzhdxf50y";
     };
 
     propagatedBuildInputs = with self; [ requests2 ];

From ac346f4be6fed9f9a1da4621254c64a7ca06d1e3 Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@bornhold.name>
Date: Tue, 21 Feb 2017 10:52:53 +0100
Subject: [PATCH 7/7] zope_configuration: Skip tests on py3

There is an open problem around namespace packages which prevents a successful
test run at the moment.
---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0ed5c5fbe3dd..b3fbc26c3313 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27591,6 +27591,10 @@ EOF
 
     propagatedBuildInputs = with self; [ zope_i18nmessageid zope_schema ];
 
+    # Trouble with implicit namespace packages on Python3
+    # see https://github.com/pypa/setuptools/issues/912
+    doCheck = !isPy3k;
+
     meta = {
         maintainers = with maintainers; [ goibhniu ];
     };