From 481363f9a8964b284ba24b1dd093232d99012435 Mon Sep 17 00:00:00 2001
From: schnusch <schnusch@users.noreply.github.com>
Date: Wed, 6 Sep 2023 00:13:37 +0200
Subject: [PATCH 1/3] python3Packages.dulwich: 0.21.5 -> 0.21.6

Changelog: https://github.com/dulwich/dulwich/blob/dulwich-0.21.6/NEWS
---
 pkgs/development/python-modules/dulwich/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix
index 3f4b8464cf8f..2e1c93f89c04 100644
--- a/pkgs/development/python-modules/dulwich/default.nix
+++ b/pkgs/development/python-modules/dulwich/default.nix
@@ -17,15 +17,15 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.21.5";
+  version = "0.21.6";
   pname = "dulwich";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-cJVeTiSd3abjSkY2uQ906THlWPmTsXxSVw+mFEuZMQM=";
+    hash = "sha256-MPvofotR84E8Ex4oQchtAHQ00WC9FttYa0DUfzHdBbA=";
   };
 
   LC_ALL = "en_US.UTF-8";

From b52d40b8671322a492676fd07eaa8bbabc886123 Mon Sep 17 00:00:00 2001
From: schnusch <schnusch@users.noreply.github.com>
Date: Tue, 5 Sep 2023 23:38:47 +0200
Subject: [PATCH 2/3] xandikos: replace prometheus-client with
 aiohttp-openmetrics

see https://github.com/jelmer/xandikos/commit/d5da74ad098b6fc42462a1c3974c229dcb7a35de
---
 pkgs/servers/xandikos/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix
index f6afb09819f8..562345db9c10 100644
--- a/pkgs/servers/xandikos/default.nix
+++ b/pkgs/servers/xandikos/default.nix
@@ -17,12 +17,12 @@ python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3Packages; [
     aiohttp
+    aiohttp-openmetrics
     dulwich
     defusedxml
     icalendar
     jinja2
     multidict
-    prometheus-client
   ];
 
   passthru.tests.xandikos = nixosTests.xandikos;

From 42deb69b51cbf306ba880836e66b8da92287b4dc Mon Sep 17 00:00:00 2001
From: schnusch <schnusch@users.noreply.github.com>
Date: Tue, 5 Sep 2023 22:58:31 +0200
Subject: [PATCH 3/3] xandikos: 0.2.8 -> 0.2.10

Diff: https://github.com/jelmer/xandikos/compare/v0.2.8...v0.2.10

Changelog: https://github.com/jelmer/xandikos/blob/v0.2.10/NEWS
---
 pkgs/servers/xandikos/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/servers/xandikos/default.nix
index 562345db9c10..e5238b90814f 100644
--- a/pkgs/servers/xandikos/default.nix
+++ b/pkgs/servers/xandikos/default.nix
@@ -6,15 +6,23 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "xandikos";
-  version = "0.2.8";
+  version = "0.2.10";
+  format = "pyproject";
+
+  disabled = python3Packages.pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "jelmer";
     repo = "xandikos";
     rev = "v${version}";
-    sha256 = "sha256-KDDk0QSOjwivJFz3vLk+g4vZMlSuX2FiOgHJfDJkpwg=";
+    hash = "sha256-SqU/K3b8OML3PvFmP7L5R3Ub9vbW66xRpf79mgFZPfc=";
   };
 
+  nativeBuildInputs = with python3Packages; [
+    setuptools
+    wheel
+  ];
+
   propagatedBuildInputs = with python3Packages; [
     aiohttp
     aiohttp-openmetrics
@@ -23,17 +31,12 @@ python3Packages.buildPythonApplication rec {
     icalendar
     jinja2
     multidict
+    vobject
   ];
 
   passthru.tests.xandikos = nixosTests.xandikos;
 
   nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
-  disabledTests = [
-    # these tests are failing due to the following error:
-    # TypeError: expected str, bytes or os.PathLike object, not int
-    "test_iter_with_etag"
-    "test_iter_with_etag_missing_uid"
-  ];
 
   meta = with lib; {
     description = "Lightweight CalDAV/CardDAV server";