Merge pull request #41085 from zimbatm/supervisor-3.3.4

python2Packages.supervisor: 3.1.4 -> 3.3.4

pkgs/development/python-modules/supervisor/default.nix

@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, isPy3k, fetchPypi
+, mock
+, meld3
+}:
+buildPythonPackage rec {
+  pname = "supervisor";
+  version = "3.3.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0wp62z9xprvz2krg02xnbwcnq6pxfq3byd8cxx8c2d8xznih28i1";
+  };
+
+  checkInputs = [ 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/;
+    license = lib.licenses.free; # http://www.repoze.org/LICENSE.txt
+    maintainers = with lib.maintainers; [ zimbatm ];
+  };
+}

pkgs/top-level/python-packages.nix

@@ -13423,27 +13423,7 @@ in {
     };
   };
 
-  supervisor = buildPythonPackage rec {
+  supervisor = callPackage ../development/python-modules/supervisor {};
-    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/;
-    };
-  };
 
   subprocess32 = callPackage ../development/python-modules/subprocess32 { };