From 11a9026eef74053b3b0c667027a73c86e740efcc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Jun 2023 22:22:13 +0000
Subject: [PATCH 1/3] python310Packages.pytest-xvfb: 2.0.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix
index ba067c19658a..c233988a9ef9 100644
--- a/pkgs/development/python-modules/pytest-xvfb/default.nix
+++ b/pkgs/development/python-modules/pytest-xvfb/default.nix
@@ -8,12 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pytest-xvfb";
-  version = "2.0.0";
+  version = "3.0.0";
   disabled = isPy27;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1kyq5rg27dsnj7dc6x9y7r8vwf8rc88y2ppnnw6r96alw0nn9fn4";
+    sha256 = "sha256-N0arH00RWfA/dRY40FNonM0oQpGzi4+wPT67579pz8A=";
   };
 
   buildInputs = [ pytest ];

From d25dbd13fb8076fab6d0b47308ebc0459f56c6b1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 Jun 2023 15:37:39 +0200
Subject: [PATCH 2/3] python311Packages.pytest-xvfb: add changelog to meta

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

diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix
index c233988a9ef9..4f21cf30a6fe 100644
--- a/pkgs/development/python-modules/pytest-xvfb/default.nix
+++ b/pkgs/development/python-modules/pytest-xvfb/default.nix
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-N0arH00RWfA/dRY40FNonM0oQpGzi4+wPT67579pz8A=";
+    hash = "sha256-N0arH00RWfA/dRY40FNonM0oQpGzi4+wPT67579pz8A=";
   };
 
   buildInputs = [ pytest ];
@@ -25,6 +25,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A pytest plugin to run Xvfb for tests";
     homepage = "https://github.com/The-Compiler/pytest-xvfb";
+    changelog = "https://github.com/The-Compiler/pytest-xvfb/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ costrouc ];
   };

From 2b09bcb52b2b5cb7cd34f0e6b79d0d27e95c019a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 10 Jun 2023 15:44:13 +0200
Subject: [PATCH 3/3] python310Packages.pytest-xvfb: disable on unsupported
 Python releases

- add format
---
 .../development/python-modules/pytest-xvfb/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix
index 4f21cf30a6fe..aef430a8e6fb 100644
--- a/pkgs/development/python-modules/pytest-xvfb/default.nix
+++ b/pkgs/development/python-modules/pytest-xvfb/default.nix
@@ -3,20 +3,24 @@
 , fetchPypi
 , pytest
 , pyvirtualdisplay
-, isPy27
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "pytest-xvfb";
   version = "3.0.0";
-  disabled = isPy27;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-N0arH00RWfA/dRY40FNonM0oQpGzi4+wPT67579pz8A=";
   };
 
-  buildInputs = [ pytest ];
+  buildInputs = [
+    pytest
+  ];
 
   propagatedBuildInputs = [
     pyvirtualdisplay