From 22255dd9d8c94e97e208bc0c57139cd2e8c856cf Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 29 Aug 2025 14:25:37 +0200
Subject: [PATCH 1/2] vdirsyncer: 0.19.3 -> 0.20.0

---
 .../python-modules/vdirsyncer/default.nix     | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix
index fa3e4b67be06..8687f00e1434 100644
--- a/pkgs/development/python-modules/vdirsyncer/default.nix
+++ b/pkgs/development/python-modules/vdirsyncer/default.nix
@@ -29,36 +29,21 @@
 
 buildPythonPackage rec {
   pname = "vdirsyncer";
-  version = "0.19.3";
+  version = "0.20.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5DeFH+uYXew1RGVPj5z23RCbCwP34ZlWCGYDCS/+so8=";
+    hash = "sha256-/rGlM1AKlcFP0VVzOhBW/jWRklU9gsB8a6BPy/xAsS0=";
   };
 
-  patches = [
-    (
-      # Fix event_loop missing
-      # TODO: remove it after vdirsyncer release 0.19.4
-      fetchpatch {
-        # https://github.com/pimutils/vdirsyncer/pull/1185
-        url = "https://github.com/pimutils/vdirsyncer/commit/164559ad7a95ed795ce4ae8d9b287bd27704742d.patch";
-        hash = "sha256-nUGvkBnHr8nVPpBuhQ5GjaRs3QSxokdZUEIsOrQ+lpo=";
-      }
-    )
-  ];
-
   nativeBuildInputs = [
     setuptools
     setuptools-scm
-    wheel
   ];
 
-  pythonRelaxDeps = [ "aiostream" ];
-
   propagatedBuildInputs = [
     atomicwrites
     click
@@ -79,6 +64,7 @@ buildPythonPackage rec {
     pytest-asyncio
     trustme
     aioresponses
+    wheel
   ];
 
   preCheck = ''

From 4e44c62c99b3ad61f0c9e2e9005885526ef63034 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 1 Sep 2025 08:07:41 +0200
Subject: [PATCH 2/2] vdirsyncer: cleanup

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

diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix
index 8687f00e1434..584a6c276cd4 100644
--- a/pkgs/development/python-modules/vdirsyncer/default.nix
+++ b/pkgs/development/python-modules/vdirsyncer/default.nix
@@ -32,19 +32,17 @@ buildPythonPackage rec {
   version = "0.20.0";
   format = "pyproject";
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-/rGlM1AKlcFP0VVzOhBW/jWRklU9gsB8a6BPy/xAsS0=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     atomicwrites
     click
     click-log
@@ -64,7 +62,6 @@ buildPythonPackage rec {
     pytest-asyncio
     trustme
     aioresponses
-    wheel
   ];
 
   preCheck = ''