From 1f6ca0f37b93efde3fff877799a8f94b11aa545b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 13 Jan 2017 16:19:46 +0100
Subject: [PATCH 01/14] pythonPackages.bcrypt: 3.1.0 -> 3.1.2

---
 pkgs/development/python-modules/bcrypt.nix | 23 ++++++++++++++++++++++
 pkgs/top-level/python-packages.nix         | 19 +-----------------
 2 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/bcrypt.nix

diff --git a/pkgs/development/python-modules/bcrypt.nix b/pkgs/development/python-modules/bcrypt.nix
new file mode 100644
index 00000000000..94f04880c8e
--- /dev/null
+++ b/pkgs/development/python-modules/bcrypt.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, isPyPy, fetchurl
+, cffi, pycparser, mock, pytest, py }:
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+  name = "bcrypt-${version}";
+  version = "3.1.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
+    sha256 = "1al54xafv1aharpb22yv5rjjc63fm60z3pn2shbiq48ah9f1fvil";
+  };
+  buildInputs = [ pycparser mock pytest py ];
+  propagatedBuildInputs = optional (!isPyPy) cffi;
+
+  meta = {
+    maintainers = with maintainers; [ domenkozar ];
+    description = "Modern password hashing for your software and your servers";
+    license = licenses.asl20;
+    homepage = https://github.com/pyca/bcrypt/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c971c926619..fcfe8bebadf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4781,24 +4781,7 @@ in {
     };
   };
 
-  bcrypt = buildPythonPackage rec {
-    name = "bcrypt-${version}";
-    version = "3.1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/b/bcrypt/${name}.tar.gz";
-      sha256 = "e54820d8b9eff357d1003f5b8d4b949a632b76b89610d8a933783fd476033ebe";
-    };
-    buildInputs = with self; [ pycparser mock pytest py ];
-    propagatedBuildInputs = with self; optional (!isPyPy) cffi;
-
-    meta = {
-      maintainers = with maintainers; [ domenkozar ];
-      description = "Modern password hashing for your software and your servers";
-      license = licenses.asl20;
-      homepage = https://github.com/pyca/bcrypt/;
-    };
-  };
+  bcrypt = callPackage ../development/python-modules/bcrypt.nix { };
 
   cffi = if isPyPy then null else buildPythonPackage rec {
     name = "cffi-1.9.1";

From 14a65c5ecdaa68ee811a686c9c6ace3bf6710eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 13 Jan 2017 16:21:37 +0100
Subject: [PATCH 02/14] pythonPackages.ldap: 2.4.19 -> 2.4.22

---
 pkgs/development/python-modules/ldap.nix | 15 +++++++++++++++
 pkgs/top-level/python-packages.nix       | 13 ++-----------
 2 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/python-modules/ldap.nix

diff --git a/pkgs/development/python-modules/ldap.nix b/pkgs/development/python-modules/ldap.nix
new file mode 100644
index 00000000000..95243f52a38
--- /dev/null
+++ b/pkgs/development/python-modules/ldap.nix
@@ -0,0 +1,15 @@
+{ buildPythonPackage, isPy3k, fetchurl
+, openldap, cyrus_sasl, openssl }:
+
+buildPythonPackage rec {
+  name = "ldap-2.4.22";
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz";
+    sha256 = "1dshpq84kl4xpa0hmnjrh6q5h5bybn09r83sa3z3ybr9jlm8gxcy";
+  };
+
+  NIX_CFLAGS_COMPILE = "-I${cyrus_sasl.dev}/include/sasl";
+  propagatedBuildInputs = [openldap cyrus_sasl openssl];
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fcfe8bebadf..db000770a73 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21164,17 +21164,8 @@ in {
     };
   });
 
-  ldap = buildPythonPackage rec {
-    name = "ldap-2.4.19";
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/python-ldap/python-${name}.tar.gz";
-      sha256 = "0j5hzaar4d0vhnrlpmkczgwm7ci2wibr99a7zx04xddzrhxdpz82";
-    };
-
-    NIX_CFLAGS_COMPILE = "-I${pkgs.cyrus_sasl.dev}/include/sasl";
-    propagatedBuildInputs = with self; [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl];
+  ldap = callPackage ../development/python-modules/ldap.nix {
+    inherit (pkgs) openldap cyrus_sasl openssl;
   };
 
   ldap3 = buildPythonPackage rec {

From c6c5ed15ab0e8c9aaa6ce77c2d13cfc6b52aa0d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 13 Jan 2017 16:27:27 +0100
Subject: [PATCH 03/14] pythonPackages.requests_oauthlib: 0.4.1 -> 0.7.0

---
 .../python-modules/requests-oauthlib.nix      | 21 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +----------------
 2 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/requests-oauthlib.nix

diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix
new file mode 100644
index 00000000000..a353ebd39d9
--- /dev/null
+++ b/pkgs/development/python-modules/requests-oauthlib.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchurl
+, oauthlib, requests2 }:
+
+buildPythonPackage rec {
+  version = "0.7.0";
+  name = "requests-oauthlib-${version}";
+
+  src = fetchurl {
+    url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz";
+    sha256 = "0cdn45k7qla0qwha0rm9pk9bcfhghvmqrdsphs73irs2rzk5cp2j";
+  };
+
+  doCheck = false;        # Internet tests fail when building in chroot
+  propagatedBuildInputs = [ oauthlib requests2 ];
+
+  meta = with stdenv.lib; {
+    description = "OAuthlib authentication support for Requests";
+    homepage = https://github.com/requests/requests-oauthlib;
+    maintainers = with maintainers; [ prikhi ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index db000770a73..4fab1ec7583 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22095,24 +22095,7 @@ in {
     };
   };
 
-  requests_oauthlib = buildPythonPackage rec {
-    version = "0.4.1";
-    name = "requests-oauthlib-${version}";
-
-    src = pkgs.fetchurl {
-      url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz";
-      sha256 = "0vx252nzq5h9m9brwnw2ph8aj526y26jr2dqcafzzcdx6z4l8vj4";
-    };
-
-    doCheck = false;        # Internet tests fail when building in chroot
-    propagatedBuildInputs = with self; [ oauthlib requests2 ];
-
-    meta = {
-      description = "OAuthlib authentication support for Requests";
-      homepage = https://github.com/requests/requests-oauthlib;
-      maintainers = with maintainers; [ prikhi ];
-    };
-  };
+  requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib.nix { };
 
   requests_toolbelt = buildPythonPackage rec {
     version = "0.6.2";

From bbe73c77c1cde3e05097fba9593d485fb38e7f04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 13 Jan 2017 16:20:20 +0100
Subject: [PATCH 04/14] pythonPackages.dulwich: 0.14.0 -> 0.14.1

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

diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich.nix
new file mode 100644
index 00000000000..d482aa14627
--- /dev/null
+++ b/pkgs/development/python-modules/dulwich.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchurl
+, gevent, geventhttpclient, mock, fastimport
+, git, glibcLocales }:
+
+buildPythonPackage rec {
+  name = "dulwich-${version}";
+  version = "0.14.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/d/dulwich/${name}.tar.gz";
+    sha256 = "14xsyxha6qyxxyf0ma3zv1sy31iy22vzwayk519n7a1gwzk4j7vw";
+  };
+
+  LC_ALL = "en_US.UTF-8";
+
+  # Only test dependencies
+  buildInputs = [ git glibcLocales gevent geventhttpclient mock fastimport ];
+
+  doCheck = !stdenv.isDarwin;
+
+  meta = with stdenv.lib; {
+    description = "Simple Python implementation of the Git file formats and protocols";
+    homepage = http://samba.org/~jelmer/dulwich/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ koral ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4fab1ec7583..1d5ccf6c170 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10758,32 +10758,10 @@ in {
     };
   };
 
-
-  dulwich = buildPythonPackage rec {
-    name = "dulwich-${version}";
-    version = "0.12.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/dulwich/${name}.tar.gz";
-      sha256 = "1ihc1bdgxj7i068mhhmkzar56r2vdcj68w0dnsm7aqgcgvrp144g";
-    };
-
-    LC_ALL = "en_US.UTF-8";
-
-    # Only test dependencies
-    buildInputs = with self; [ pkgs.git gevent geventhttpclient pkgs.glibcLocales mock fastimport ];
-
-    doCheck = !stdenv.isDarwin;
-
-    meta = {
-      description = "Simple Python implementation of the Git file formats and protocols";
-      homepage = http://samba.org/~jelmer/dulwich/;
-      license = licenses.gpl2Plus;
-      maintainers = with maintainers; [ koral ];
-    };
+  dulwich = callPackage ../development/python-modules/dulwich.nix {
+    inherit (pkgs) git glibcLocales;
   };
 
-
   hg-git = buildPythonPackage rec {
     name = "hg-git-${version}";
     version = "0.8.5";

From 1f5b7484a3b423fc3de67835edc031bdea44fcea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:08:19 +0100
Subject: [PATCH 05/14] pythonPackages.gunicorn: 19.1.0 -> 19.3.0

---
 pkgs/development/python-modules/gunicorn.nix | 23 ++++++++++++++++++++
 pkgs/top-level/python-packages.nix           | 16 +-------------
 2 files changed, 24 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/gunicorn.nix

diff --git a/pkgs/development/python-modules/gunicorn.nix b/pkgs/development/python-modules/gunicorn.nix
new file mode 100644
index 00000000000..026e9df360c
--- /dev/null
+++ b/pkgs/development/python-modules/gunicorn.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchurl
+, pytest, mock, pytestcov, coverage }:
+
+buildPythonPackage rec {
+  name = "gunicorn-19.3.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/g/gunicorn/${name}.tar.gz";
+    sha256 = "12d0jd9y9fyssc28mn8j6nzrck8y05hc946p5h0rmbc25043bj4b";
+  };
+
+  buildInputs = [ pytest mock pytestcov coverage ];
+
+  prePatch = ''
+    substituteInPlace requirements_test.txt --replace "==" ">="
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://pypi.python.org/pypi/gunicorn;
+    description = "WSGI HTTP Server for UNIX";
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1d5ccf6c170..639d7dc5bc2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12418,21 +12418,7 @@ in {
     };
   };
 
-  gunicorn = buildPythonPackage rec {
-    name = "gunicorn-19.1.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/g/gunicorn/${name}.tar.gz";
-      sha256 = "ae1dd6452f62b3470bc9acaf62cb5301545fbb9c697d863a5bfe35097ed7a0b3";
-    };
-
-    buildInputs = with self; [ pytest ];
-
-    meta = {
-      homepage = http://pypi.python.org/pypi/gunicorn;
-      description = "WSGI HTTP Server for UNIX";
-    };
-  };
+  gunicorn = callPackage ../development/python-modules/gunicorn.nix { };
 
   hawkauthlib = buildPythonPackage rec {
     name = "hawkauthlib-${version}";

From 1094e948bfde4deb76221950554e0893bc654490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:09:18 +0100
Subject: [PATCH 06/14] pythonPackages.markdown2: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/development/python-modules/markdown2.nix b/pkgs/development/python-modules/markdown2.nix
new file mode 100644
index 00000000000..af7511bc9aa
--- /dev/null
+++ b/pkgs/development/python-modules/markdown2.nix
@@ -0,0 +1,18 @@
+{ stdenv, buildPythonPackage, fetchurl }:
+
+buildPythonPackage rec {
+  name = "markdown2-${version}";
+  version = "2.3.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/m/markdown2/${name}.zip";
+    sha256 = "03nqcx79r9lr5gp2zpqa1n54hnxqczdq27f2j3aazr3r9rsxsqs4";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A fast and complete Python implementation of Markdown";
+    homepage =  https://github.com/trentm/python-markdown2;
+    license = licenses.mit;
+    maintainers = with maintainers; [ hbunke ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 639d7dc5bc2..4b249d169cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -29530,24 +29530,7 @@ EOF
     };
   };
 
-
-  markdown2 = buildPythonPackage rec {
-    name = "markdown2-${version}";
-    version = "2.3.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/markdown2/${name}.zip";
-      sha256 = "073zyx3caqa9zlzxa82k9k2nhhn8c5imqpgp5nwqnh0fgaj9pqn8";
-    };
-    propagatedBuildInputs = with self; [];
-    meta = {
-      description = "A fast and complete Python implementation of Markdown";
-      homepage =  https://github.com/trentm/python-markdown2;
-      license = licenses.mit;
-      maintainers = with maintainers; [ hbunke ];
-    };
-  };
-
+  markdown2 = callPackage ../development/python-modules/markdown2.nix { };
 
   evernote = buildPythonPackage rec {
     name = "evernote-${version}";

From 0b3d711fc4e65c03f197736843250ecb5e1d6452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 13 Jan 2017 23:47:34 +0100
Subject: [PATCH 07/14] pythonPackages.flask_login: enable python3 tests

---
 .../python-modules/flask-login.nix            | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 23 +--------------
 2 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/development/python-modules/flask-login.nix

diff --git a/pkgs/development/python-modules/flask-login.nix b/pkgs/development/python-modules/flask-login.nix
new file mode 100644
index 00000000000..0149e29bcf7
--- /dev/null
+++ b/pkgs/development/python-modules/flask-login.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub, pythonAtLeast
+, flask, nose, mock, blinker}:
+
+buildPythonPackage rec {
+  name = "Flask-Login-${version}";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "maxcountryman";
+    repo = "flask-login";
+    rev = version;
+    sha256 = "0sjbmk8m4mmd9g99n6c6lx9nv2jwwqp6qsqhl945w2m0f1sknwdh";
+  };
+
+  buildInputs = [ nose mock ];
+  propagatedBuildInputs = [ flask blinker ];
+
+  checkPhase = "nosetests -d";
+
+  doCheck = pythonAtLeast "3.3";
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/maxcountryman/flask-login";
+    description = "User session management for Flask";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b249d169cc..716d8a4c056 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11320,28 +11320,7 @@ in {
     };
   };
 
-  flask_login = buildPythonPackage rec {
-    name = "Flask-Login-${version}";
-    version = "0.4.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/F/Flask-Login/${name}.tar.gz";
-      sha256 = "19w2f33lglkyvxqnj3qghhxa4pr8mp13235k1bd557x52imkapnj";
-    };
-
-    propagatedBuildInputs = with self; [ flask ];
-
-    # FIXME
-    doCheck = false;
-
-    meta = {
-      homepage = "https://github.com/maxcountryman/flask-login";
-      description = "User session management for Flask";
-      license = licenses.mit;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ abbradar ];
-    };
-  };
+  flask_login = callPackage ../development/python-modules/flask-login.nix { };
 
   flask_migrate = buildPythonPackage rec {
     name = "Flask-Migrate-${version}";

From c065c400e9ace3678ec7949f88ed5c7b616d0e51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 17:30:11 +0100
Subject: [PATCH 08/14] pythonPackages.flask_elastic: init at 0.2

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

diff --git a/pkgs/development/python-modules/flask-elastic.nix b/pkgs/development/python-modules/flask-elastic.nix
new file mode 100644
index 00000000000..9ea9616fbda
--- /dev/null
+++ b/pkgs/development/python-modules/flask-elastic.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchurl
+, flask, elasticsearch }:
+
+buildPythonPackage rec {
+  name = "Flask-Elastic-${version}";
+  version = "0.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/F/Flask-Elastic/${name}.tar.gz";
+    sha256 = "0hqkwff6z78aspkf1cf815qwp02g3ch1y9dhm5v2ap8vakyac0az";
+  };
+
+  propagatedBuildInputs = [ flask elasticsearch ];
+  doCheck = false; # no tests
+
+  meta = with stdenv.lib; {
+    description = "Integrates official client for Elasticsearch into Flask";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.mic92 ];
+    homepage = https://github.com/cepture/foppch/flask-elastic;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 716d8a4c056..974b3ec1f21 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11320,6 +11320,8 @@ in {
     };
   };
 
+  flask_elastic = callPackage ../development/python-modules/flask-elastic.nix { };
+
   flask_login = callPackage ../development/python-modules/flask-login.nix { };
 
   flask_migrate = buildPythonPackage rec {

From b3bef109c2713af76c0216f94b748e638fd9a894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Fri, 13 Jan 2017 23:55:52 +0100
Subject: [PATCH 09/14] pythonPackages.flask-ldap-login: init at 0.3.0

---
 .../python-modules/flask-ldap-login.nix       | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-ldap-login.nix

diff --git a/pkgs/development/python-modules/flask-ldap-login.nix b/pkgs/development/python-modules/flask-ldap-login.nix
new file mode 100644
index 00000000000..37f9d72dd3f
--- /dev/null
+++ b/pkgs/development/python-modules/flask-ldap-login.nix
@@ -0,0 +1,25 @@
+{ stdenv, buildPythonPackage, fetchurl
+, flask, flask_wtf, flask_testing, ldap
+, mock, nose }:
+
+buildPythonPackage rec {
+  name = "flask-ldap-login-0.3.0";
+
+  src = fetchurl {
+    url = "mirror://pypi/f/flask-ldap-login/${name}.tar.gz";
+    sha256 = "085rik7q8xrp5g95346p6jcp9m2yr8kamwb2kbiw4q0b0fpnnlgq";
+  };
+
+  buildInputs = [ nose mock flask_testing ];
+  propagatedBuildInputs = [ flask flask_wtf ldap ];
+
+  checkPhase = "nosetests -d";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ContinuumIO/flask-ldap-login;
+    description = "User session management for Flask";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 974b3ec1f21..c0f8bac3523 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11324,6 +11324,8 @@ in {
 
   flask_login = callPackage ../development/python-modules/flask-login.nix { };
 
+  flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login.nix { };
+
   flask_migrate = buildPythonPackage rec {
     name = "Flask-Migrate-${version}";
     version = "1.7.0";

From f957ce45c477b37fbd6fa559c5b9fc47d1fae86f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:07:28 +0100
Subject: [PATCH 10/14] pythonPackages.flask_oauthlib: init at 0.9.3

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

diff --git a/pkgs/development/python-modules/flask-oauthlib.nix b/pkgs/development/python-modules/flask-oauthlib.nix
new file mode 100644
index 00000000000..83413dadb7f
--- /dev/null
+++ b/pkgs/development/python-modules/flask-oauthlib.nix
@@ -0,0 +1,29 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub
+, flask, oauthlib, requests_oauthlib, flask_sqlalchemy
+, mock, nose}:
+buildPythonPackage rec {
+  name = "Flask-OAuthlib-${version}";
+  version = "0.9.3";
+
+  src = fetchFromGitHub {
+    owner = "lepture";
+    repo = "flask-oauthlib";
+    rev = "v${version}";
+    sha256 = "1vnr2kmbwl6mv2fsv92jjxzfibq2m3pnbcs6ba9k32jr1ci7wfh7";
+  };
+
+  buildInputs = [ mock nose ];
+  propagatedBuildInputs = [
+    flask flask_sqlalchemy oauthlib requests_oauthlib
+  ];
+
+  checkPhase = "nosetests -d";
+  doCheck = false; # request mocking fails
+
+  meta = with stdenv.lib; {
+    description = "OAuthlib implementation for Flask";
+    license = licenses.mit;
+    maintainers = [ maintainers.mic92 ];
+    homepage = https://github.com/lepture/flask-oauthlib;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c0f8bac3523..cb28d01b2b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11351,6 +11351,8 @@ in {
     };
   };
 
+  flask_oauthlib = callPackage ../development/python-modules/flask-oauthlib.nix { };
+
   flask_principal = buildPythonPackage rec {
     name = "Flask-Principal-${version}";
     version = "0.4.0";

From b9e0da457a593dff4541ad9b8191835ea61d3d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:12:03 +0100
Subject: [PATCH 11/14] pythonPackages.ghdiff: init at 0.4

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

diff --git a/pkgs/development/python-modules/ghdiff.nix b/pkgs/development/python-modules/ghdiff.nix
new file mode 100644
index 00000000000..156d9f23729
--- /dev/null
+++ b/pkgs/development/python-modules/ghdiff.nix
@@ -0,0 +1,21 @@
+{ stdenv, buildPythonPackage, fetchurl
+, zope_testrunner, six, chardet}:
+
+buildPythonPackage rec {
+  name = "ghdiff-0.4";
+
+  src = fetchurl {
+    url = "mirror://pypi/g/ghdiff/${name}.tar.gz";
+    sha256 = "17mdhi2sq9017nq8rkjhhc87djpi5z99xiil0xz17dyplr7nmkqk";
+  };
+
+  buildInputs = [ zope_testrunner ];
+  propagatedBuildInputs = [ six chardet ];
+
+  meta = with stdenv.lib; {
+    homepage =  https://github.com/kilink/ghdiff;
+    license = license.mit;
+    description = "Generate Github-style HTML for unified diffs.";
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cb28d01b2b8..b400c5a41a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12082,6 +12082,8 @@ in {
     };
   };
 
+  ghdiff = callPackage ../development/python-modules/ghdiff.nix { };
+
   gipc = buildPythonPackage rec {
     name = "gipc-0.5.0";
     disabled = !isPy26 && !isPy27;

From 5da2caab634d052f44933a9dbf47a41d7c4c14d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:13:45 +0100
Subject: [PATCH 12/14] pythonPackages.flask_testing: init at 0.6.1

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

diff --git a/pkgs/development/python-modules/flask-testing.nix b/pkgs/development/python-modules/flask-testing.nix
new file mode 100644
index 00000000000..c5fe8f8bdbe
--- /dev/null
+++ b/pkgs/development/python-modules/flask-testing.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, buildPythonPackage, pythonOlder
+, flask, blinker, twill }:
+
+with stdenv.lib;
+
+buildPythonPackage rec {
+  name = "Flask-Testing-0.6.1";
+
+  src = fetchurl {
+    url = "mirror://pypi/F/Flask-Testing/${name}.tar.gz";
+    sha256 = "1ckmy7kz2qkggdlm9y5wx6gvd2x7qv921dyb059ywfh15hrkkxdb";
+  };
+
+  buildInputs = optionals (pythonOlder "3.0") [ twill ];
+  propagatedBuildInputs = [ flask blinker ];
+
+  meta = {
+    description = "Flask unittest integration.";
+    homepage = https://pythonhosted.org/Flask-Testing/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b400c5a41a5..62294be8b35 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11430,6 +11430,8 @@ in {
     };
   };
 
+  flask_testing = callPackage ../development/python-modules/flask-testing.nix { };
+
   wtforms = buildPythonPackage rec {
     version = "2.1";
     name = "wtforms-${version}";

From 3b44782026bcd839b5c98690d548c75e8dce3619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:17:33 +0100
Subject: [PATCH 13/14] pythonPackages.flask_wtf: init at 0.14.2

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

diff --git a/pkgs/development/python-modules/flask-wtf.nix b/pkgs/development/python-modules/flask-wtf.nix
new file mode 100644
index 00000000000..f8f94736680
--- /dev/null
+++ b/pkgs/development/python-modules/flask-wtf.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, buildPythonPackage, flask, wtforms, nose }:
+
+buildPythonPackage rec {
+  name = "Flask-WTF-0.14.2";
+
+  src = fetchurl {
+    url = "mirror://pypi/F/Flask-WTF/${name}.tar.gz";
+    sha256 = "0dncc5as2k61b28k8kal5yh3prmv7zya1jz7kvci7ximzmfda52x";
+  };
+
+  propagatedBuildInputs = [ flask wtforms nose ];
+
+  doCheck = false; # requires external service
+
+  meta = with stdenv.lib; {
+    description = "Simple integration of Flask and WTForms.";
+    license = licenses.bsd;
+    maintainers = [ maintainers.mic92 ];
+    homepage = https://github.com/lepture/flask-wtf/;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62294be8b35..6ec0a960611 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11432,6 +11432,8 @@ in {
 
   flask_testing = callPackage ../development/python-modules/flask-testing.nix { };
 
+  flask_wtf = callPackage ../development/python-modules/flask-wtf.nix { };
+
   wtforms = buildPythonPackage rec {
     version = "2.1";
     name = "wtforms-${version}";

From 17c457e47bd60e26d0c5135e0126d519cc69a653 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Sat, 14 Jan 2017 00:17:58 +0100
Subject: [PATCH 14/14] pythonPackages.twill: init at 0.9.1

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

diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix
new file mode 100644
index 00000000000..6d4e3cbf1df
--- /dev/null
+++ b/pkgs/development/python-modules/twill/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchurl, isPy3k, pythonPackages }:
+buildPythonPackage rec {
+  name = "twill-0.9.1";
+
+  disabled = isPy3k;
+
+  src = fetchurl {
+    url    = "mirror://pypi/t/twill/${name}.tar.gz";
+    sha256 = "0zmssp41cgb5sz1jym7rxy6mamb64dxq3wra1bn6snna9v653pyj";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [ nose ];
+
+  doCheck = false; # pypi package comes without tests, other homepage does not provide all verisons
+
+  meta = with stdenv.lib; {
+    homepage = http://twill.idyll.org/;
+    description = "a simple scripting language for Web browsing";
+    license     = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ Mic92 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ec0a960611..0186b8499fc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25879,6 +25879,8 @@ in {
     };
   };
 
+  twill = callPackage ../development/python-modules/twill { };
+
   twitter = buildPythonPackage rec {
     name = "twitter-${version}";
     version = "1.15.0";