From 1cd792cf79762e958327c8373ad811bdc2c292c4 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 25 May 2018 21:35:25 +0100
Subject: [PATCH 1/2] python2Packages.supervisor: 3.1.4 -> 3.3.4

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

diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix
new file mode 100644
index 00000000000..5ed7427af87
--- /dev/null
+++ b/pkgs/development/python-modules/supervisor/default.nix
@@ -0,0 +1,26 @@
+{ lib, buildPythonPackage, isPy3k, fetchPypi
+, mock
+, meld3
+}:
+buildPythonPackage rec {
+  pname = "supervisor";
+  version = "3.3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wp62z9xprvz2krg02xnbwcnq6pxfq3byd8cxx8c2d8xznih28i1";
+  };
+
+  buildInputs = [ mock ];
+
+  propagatedBuildInputs = [ meld3 ];
+
+  # Supervisor requires Python 2.4 or later but does not work on any version of Python 3.  You are using version 3.6.5 (default, Mar 28 2018, 10:24:30)
+  disabled = isPy3k;
+
+  meta = {
+    description = "A system for controlling process state under UNIX";
+    homepage = http://supervisord.org/;
+    maintainers = with lib.maintainers; [ zimbatm ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ea969f142b..80e6bf35039 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13418,27 +13418,7 @@ in {
     };
   };
 
-  supervisor = buildPythonPackage rec {
-    name = "supervisor-3.1.4";
-
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/supervisor/${name}.tar.gz";
-      sha256 = "0kk0sv7780m4dzmrcb2m284krz907jh8jp7khz5a79qryy4m1xw2";
-    };
-
-    buildInputs = with self; [ mock ];
-    propagatedBuildInputs = with self; [ meld3 ];
-
-    # failing tests when building under chroot as root user doesn't exist
-    doCheck = false;
-
-    meta = {
-      description = "A system for controlling process state under UNIX";
-      homepage = http://supervisord.org/;
-    };
-  };
+  supervisor = callPackage ../development/python-modules/supervisor {};
 
   subprocess32 = callPackage ../development/python-modules/subprocess32 { };
 

From e264c341242583afc18236cae1f050a7a8e152eb Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 25 May 2018 22:34:12 +0100
Subject: [PATCH 2/2] squashme: fixes

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

diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix
index 5ed7427af87..2d2a03d37ae 100644
--- a/pkgs/development/python-modules/supervisor/default.nix
+++ b/pkgs/development/python-modules/supervisor/default.nix
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "0wp62z9xprvz2krg02xnbwcnq6pxfq3byd8cxx8c2d8xznih28i1";
   };
 
-  buildInputs = [ mock ];
+  checkInputs = [ mock ];
 
   propagatedBuildInputs = [ meld3 ];
 
@@ -21,6 +21,7 @@ buildPythonPackage rec {
   meta = {
     description = "A system for controlling process state under UNIX";
     homepage = http://supervisord.org/;
+    license = lib.licenses.free; # http://www.repoze.org/LICENSE.txt
     maintainers = with lib.maintainers; [ zimbatm ];
   };
 }