From eea4ff895df6ec9bb19ba3b283239310771b03f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 2 Jan 2019 19:34:32 +0100
Subject: [PATCH 1/3] python.pkgs.kajiki: fix tests

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

diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix
index e9164d8bcf6..ba71e03ce99 100644
--- a/pkgs/development/python-modules/kajiki/default.nix
+++ b/pkgs/development/python-modules/kajiki/default.nix
@@ -4,6 +4,7 @@
 , Babel
 , pytz
 , nine
+, nose
 }:
 
 buildPythonPackage rec {
@@ -16,6 +17,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ Babel pytz nine ];
+  checkInputs = [ nose ];
 
   meta = with stdenv.lib; {
     description = "Kajiki provides fast well-formed XML templates";

From 31a77f43310afc75c44181d02984606efd93c528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 2 Jan 2019 19:31:14 +0100
Subject: [PATCH 2/3] cherrypy: re-enable python2 support

we need cherrypy for ceph -> sambaFull
---
 .../python-modules/cherrypy/default.nix        | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index cbb8774f55f..1763ccbce85 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -5,15 +5,21 @@
 , backports_functools_lru_cache, requests_toolbelt
 }:
 
-buildPythonPackage rec {
+let
+  srcInfo = if isPy3k then {
+    version = "18.0.1";
+    sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
+  } else {
+    version = "17.4.1";
+    sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
+  };
+in buildPythonPackage rec {
   pname = "CherryPy";
-  version = "18.0.1";
-
-  disabled = !isPy3k;
+  inherit (srcInfo) version;
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
+    inherit pname;
+    inherit (srcInfo) version sha256;
   };
 
   propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];

From 17ef8c1c85b65b2dc6358e91931a91656fc5386e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 2 Jan 2019 19:40:35 +0100
Subject: [PATCH 3/3] python.pkgs.pecan: fix build

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

diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix
index c6c5b99d980..70d71ea5179 100644
--- a/pkgs/development/python-modules/pecan/default.nix
+++ b/pkgs/development/python-modules/pecan/default.nix
@@ -12,6 +12,7 @@
 , gunicorn
 , jinja2
 , virtualenv
+, mock
 }:
 
 buildPythonPackage rec {
@@ -28,6 +29,8 @@ buildPythonPackage rec {
     webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
   ];
 
+  checkInputs = [ mock ];
+
   meta = with stdenv.lib; {
     description = "Pecan";
     homepage = "https://github.com/pecan/pecan";