From 7bce97a715242a93b4708ce63a21e49832b19a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 3 Mar 2026 16:20:47 -0800
Subject: [PATCH 1/3] python3Packages.caldav: 2.2.6 -> 3.2.1

Diff: https://github.com/python-caldav/caldav/compare/v2.2.6...v3.2.1

Changelog: https://github.com/python-caldav/caldav/blob/v3.2.1/CHANGELOG.md
---
 pkgs/development/python-modules/caldav/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix
index 2ad6b596042d..057a14eb3a5f 100644
--- a/pkgs/development/python-modules/caldav/default.nix
+++ b/pkgs/development/python-modules/caldav/default.nix
@@ -16,6 +16,7 @@
   hatch-vcs,
   proxy-py,
   pyfakefs,
+  pytest-asyncio,
   python-dateutil,
   pyyaml,
   toPythonModule,
@@ -27,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "caldav";
-  version = "2.2.6";
+  version = "3.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-caldav";
     repo = "caldav";
     tag = "v${version}";
-    hash = "sha256-xtxWDlYESIwkow/YdjaUAkJ/x2jdUyhqfSRycJVLncY=";
+    hash = "sha256-SCqc0MVxKaHpES+NkDcaItHlkk0kCFj6kFqH8k08vdA=";
   };
 
   build-system = [
@@ -57,6 +58,7 @@ buildPythonPackage rec {
     manuel
     proxy-py
     pyfakefs
+    pytest-asyncio
     pytestCheckHook
     (toPythonModule (radicale.override { python3 = python; }))
     tzlocal
@@ -65,11 +67,6 @@ buildPythonPackage rec {
     (toPythonModule (xandikos.override { python3Packages = python.pkgs; }))
   ];
 
-  disabledTests = [
-    # test contacts CalDAV servers on the internet
-    "test_rfc8764_test_conf"
-  ];
-
   __darwinAllowLocalNetworking = true;
 
   pythonImportsCheck = [ "caldav" ];

From db40e3f5c24fa5553f98da2f8f4d0ba00b3125e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 30 May 2026 13:00:45 -0700
Subject: [PATCH 2/3] python3Packages.caldav_2: init at 2.2.6

---
 pkgs/development/python-modules/caldav/2.nix | 85 ++++++++++++++++++++
 pkgs/top-level/python-packages.nix           |  2 +
 2 files changed, 87 insertions(+)
 create mode 100644 pkgs/development/python-modules/caldav/2.nix

diff --git a/pkgs/development/python-modules/caldav/2.nix b/pkgs/development/python-modules/caldav/2.nix
new file mode 100644
index 000000000000..f96cff3b0806
--- /dev/null
+++ b/pkgs/development/python-modules/caldav/2.nix
@@ -0,0 +1,85 @@
+{
+  buildPythonPackage,
+  dnspython,
+  fetchFromGitHub,
+  hatch-vcs,
+  hatchling,
+  icalendar,
+  icalendar-searcher,
+  lib,
+  lxml,
+  manuel,
+  niquests,
+  proxy-py,
+  pyfakefs,
+  pytest-asyncio,
+  pytestCheckHook,
+  python,
+  python-dateutil,
+  pyyaml,
+  radicale,
+  recurring-ical-events,
+  toPythonModule,
+  tzlocal,
+  vobject,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "caldav";
+  version = "2.2.6";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "python-caldav";
+    repo = "caldav";
+    tag = "v${version}";
+    hash = "sha256-xtxWDlYESIwkow/YdjaUAkJ/x2jdUyhqfSRycJVLncY=";
+  };
+
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];
+
+  dependencies = [
+    dnspython
+    lxml
+    niquests
+    icalendar
+    icalendar-searcher
+    recurring-ical-events
+    python-dateutil
+    pyyaml
+  ];
+
+  pythonImportsCheck = [ "caldav" ];
+
+  nativeCheckInputs = [
+    manuel
+    proxy-py
+    pyfakefs
+    pytestCheckHook
+    (toPythonModule (radicale.override { python3 = python; }))
+    tzlocal
+    vobject
+    writableTmpDirAsHomeHook
+  ];
+
+  disabledTests = [
+    # test contacts CalDAV servers on the internet
+    "test_rfc8764_test_conf"
+    # succeeds with Xandikos but fails with Radicale
+    "testConfigfile"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
+    changelog = "https://github.com/python-caldav/caldav/blob/${src.tag}/CHANGELOG.md";
+    description = "CalDAV (RFC4791) client library";
+    homepage = "https://github.com/python-caldav/caldav";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 47db72e8d5be..3288394554b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2472,6 +2472,8 @@ self: super: with self; {
 
   caldav = callPackage ../development/python-modules/caldav { };
 
+  caldav_2 = callPackage ../development/python-modules/caldav/2.nix { };
+
   callee = callPackage ../development/python-modules/callee { };
 
   calmjs = callPackage ../development/python-modules/calmjs { };

From 9f8581edf1cb23f7bc11013c03eab04acb938886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 30 May 2026 13:01:33 -0700
Subject: [PATCH 3/3] home-assistant: use caldav_2

---
 pkgs/servers/home-assistant/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index e930d470b54a..ec971815ffd5 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -86,6 +86,8 @@ let
         ];
       });
 
+      caldav = self.caldav_2;
+
       gspread = super.gspread.overridePythonAttrs (oldAttrs: rec {
         version = "5.12.4";
         src = fetchFromGitHub {