From fed70c1eaa7982733dc59b105e556d0361d0dc5c Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 10 Mar 2023 20:16:07 +0100
Subject: [PATCH 1/2] vdirsyncer: 0.19.0->0.19.1

---
 .../python-modules/vdirsyncer/default.nix            | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix
index 418850444c7f..143a7576a49d 100644
--- a/pkgs/development/python-modules/vdirsyncer/default.nix
+++ b/pkgs/development/python-modules/vdirsyncer/default.nix
@@ -24,21 +24,21 @@
 
 buildPythonPackage rec {
   pname = "vdirsyncer";
-  version = "0.19.0";
-  format = "setuptools";
+  version = "0.19.1";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256:0995bavlv8s9j0127ncq3yzy5p72lam9qgpswyjfanc6l01q87lf";
+    hash = "sha256-qnbHclqlpxH2N0vFzYO+eKrmjHSCljWp7Qc81MCfA64=";
   };
 
   postPatch = ''
     substituteInPlace setup.py \
       --replace "click-log>=0.3.0, <0.4.0" "click-log>=0.3.0, <0.5.0"
 
-    sed -i -e '/--cov/d' -e '/--no-cov/d' setup.cfg
+    sed -i -e '/--cov/d' -e '/--no-cov/d' pyproject.toml
   '';
 
   propagatedBuildInputs = [
@@ -53,10 +53,6 @@ buildPythonPackage rec {
     aiohttp-oauthlib
   ];
 
-  nativeBuildInputs = [
-    setuptools-scm
-  ];
-
   nativeCheckInputs = [
     hypothesis
     pytestCheckHook

From 16a5e2dd58f8d078023013314b23b25c4afb566f Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Mon, 13 Mar 2023 07:51:45 +0100
Subject: [PATCH 2/2] vdirsyncer: remove unneeded substituteInPlace

Upstream fixed the issue.
---
 pkgs/development/python-modules/vdirsyncer/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix
index 143a7576a49d..034998fc904b 100644
--- a/pkgs/development/python-modules/vdirsyncer/default.nix
+++ b/pkgs/development/python-modules/vdirsyncer/default.nix
@@ -35,9 +35,6 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
-    substituteInPlace setup.py \
-      --replace "click-log>=0.3.0, <0.4.0" "click-log>=0.3.0, <0.5.0"
-
     sed -i -e '/--cov/d' -e '/--no-cov/d' pyproject.toml
   '';