From 328e0ab47cc5f0400b0ca460bd303a5a10dbbc11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Dec 2022 23:04:39 +0000
Subject: [PATCH 1/2] python310Packages.supervisor: 4.2.4 -> 4.2.5

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

diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix
index 9af3db2de490..79c3606ae936 100644
--- a/pkgs/development/python-modules/supervisor/default.nix
+++ b/pkgs/development/python-modules/supervisor/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "supervisor";
-  version = "4.2.4";
+  version = "4.2.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "40dc582ce1eec631c3df79420b187a6da276bbd68a4ec0a8f1f123ea616b97a2";
+    sha256 = "sha256-NHYbrhojxYGSKBpRFfsH+/IsmwEzwIFmvv/HD+0+vBI=";
   };
 
   # wants to write to /tmp/foo which is likely already owned by another

From 8b3e8abeec23263d1dac8942705d2ddb6feb9619 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 25 Dec 2022 09:53:44 +0100
Subject: [PATCH 2/2] python310Packages.supervisor: add changelog to meta

- switch to pytestCheckHook
---
 .../python-modules/supervisor/default.nix     | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix
index 79c3606ae936..97492250dc4d 100644
--- a/pkgs/development/python-modules/supervisor/default.nix
+++ b/pkgs/development/python-modules/supervisor/default.nix
@@ -1,31 +1,46 @@
-{ stdenv, lib, buildPythonPackage, fetchPypi
+{ lib
+, stdenv
+, buildPythonPackage
+, fetchPypi
 , mock
-, pytest
+, pytestCheckHook
+, pythonOlder
 , setuptools
 }:
 
 buildPythonPackage rec {
   pname = "supervisor";
   version = "4.2.5";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "sha256-NHYbrhojxYGSKBpRFfsH+/IsmwEzwIFmvv/HD+0+vBI=";
   };
 
+  propagatedBuildInputs = [
+    setuptools
+  ];
+
   # wants to write to /tmp/foo which is likely already owned by another
   # nixbld user on hydra
   doCheck = !stdenv.isDarwin;
-  checkInputs = [ mock pytest ];
-  checkPhase = ''
-    pytest
-  '';
 
-  propagatedBuildInputs = [ setuptools ];
+  checkInputs = [
+    mock
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "supervisor"
+  ];
 
   meta = with lib; {
     description = "A system for controlling process state under UNIX";
     homepage = "http://supervisord.org/";
+    changelog = "https://github.com/Supervisor/supervisor/blob/${version}/CHANGES.rst";
     license = licenses.free; # http://www.repoze.org/LICENSE.txt
     maintainers = with maintainers; [ zimbatm ];
   };