From 41c605d3f27c24cea7fd673220dca1b7c4e79195 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 29 Apr 2024 11:46:52 +0200
Subject: [PATCH 1/3] python312Packages.watchdog-gevent: refactor

---
 .../python-modules/watchdog-gevent/default.nix    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/watchdog-gevent/default.nix b/pkgs/development/python-modules/watchdog-gevent/default.nix
index e1b812b9612f..c892c670431a 100644
--- a/pkgs/development/python-modules/watchdog-gevent/default.nix
+++ b/pkgs/development/python-modules/watchdog-gevent/default.nix
@@ -3,30 +3,35 @@
 , fetchFromGitHub
 , gevent
 , pytestCheckHook
+, setuptools
+, pythonOlder
 , watchdog
 }:
 
 buildPythonPackage rec {
   pname = "watchdog-gevent";
   version = "0.1.1";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
 
-  # Need to fetch from github because tests are not present in pypi
   src = fetchFromGitHub {
     owner = "Bogdanp";
     repo = "watchdog_gevent";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     hash = "sha256-FESm3fNuLmOg2ilI/x8U9LuAimHLnahcTHYzW/nzOVY=";
   };
 
-  propagatedBuildInputs = [ watchdog gevent ];
-
   postPatch = ''
     sed -i setup.cfg \
       -e 's:--cov watchdog_gevent::' \
       -e 's:--cov-report html::'
   '';
 
+  build-system = [ setuptools ];
+
+  dependencies = [ gevent watchdog ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "watchdog_gevent" ];

From ef3f03f77a2715e7db16d9a79093aeb07c7c91bd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 29 Apr 2024 11:47:33 +0200
Subject: [PATCH 2/3] python312Packages.watchdog-gevent: format with nixfmt

---
 .../watchdog-gevent/default.nix               | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/watchdog-gevent/default.nix b/pkgs/development/python-modules/watchdog-gevent/default.nix
index c892c670431a..2db64a84999c 100644
--- a/pkgs/development/python-modules/watchdog-gevent/default.nix
+++ b/pkgs/development/python-modules/watchdog-gevent/default.nix
@@ -1,11 +1,12 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, gevent
-, pytestCheckHook
-, setuptools
-, pythonOlder
-, watchdog
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  gevent,
+  pytestCheckHook,
+  setuptools,
+  pythonOlder,
+  watchdog,
 }:
 
 buildPythonPackage rec {
@@ -30,7 +31,10 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = [ gevent watchdog ];
+  dependencies = [
+    gevent
+    watchdog
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 12a842cafd77064869e81f9a6ba6fbf6a559bbf1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 30 Apr 2024 19:41:41 +0200
Subject: [PATCH 3/3] python312Packages.watchdog-gevent: add patch for test

---
 .../python-modules/watchdog-gevent/default.nix         | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/watchdog-gevent/default.nix b/pkgs/development/python-modules/watchdog-gevent/default.nix
index 2db64a84999c..fb5951a38ce4 100644
--- a/pkgs/development/python-modules/watchdog-gevent/default.nix
+++ b/pkgs/development/python-modules/watchdog-gevent/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   gevent,
   pytestCheckHook,
   setuptools,
@@ -23,6 +24,15 @@ buildPythonPackage rec {
     hash = "sha256-FESm3fNuLmOg2ilI/x8U9LuAimHLnahcTHYzW/nzOVY=";
   };
 
+  patches = [
+    # Add new event_filter argument to GeventEmitter
+    (fetchpatch {
+      name = "new-event_filter-argument.patch";
+      url = "https://github.com/Bogdanp/watchdog_gevent/commit/a98b6599aefb6f1ea6f9682485ed460c52f6e55f.patch";
+      hash = "sha256-lbUtl8IbnJjlsIpbC+wXLvYB+ZtUuHWqFtf31Bfqc2I=";
+    })
+  ];
+
   postPatch = ''
     sed -i setup.cfg \
       -e 's:--cov watchdog_gevent::' \