From 149c810dcf8678a5c2f87ba44bd77793fb18adbb Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Sat, 4 May 2024 15:23:57 -0400
Subject: [PATCH] radicale: 3.1.9 -> 3.2.0

---
 .../radicale/3.x.nix => by-name/ra/radicale/package.nix}     | 5 +++--
 pkgs/top-level/all-packages.nix                              | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename pkgs/{servers/radicale/3.x.nix => by-name/ra/radicale/package.nix} (91%)

diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/by-name/ra/radicale/package.nix
similarity index 91%
rename from pkgs/servers/radicale/3.x.nix
rename to pkgs/by-name/ra/radicale/package.nix
index c9523233379e..d3637df36b07 100644
--- a/pkgs/servers/radicale/3.x.nix
+++ b/pkgs/by-name/ra/radicale/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "radicale";
-  version = "3.1.9";
+  version = "3.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "Radicale";
     rev = "v${version}";
-    hash = "sha256-i4NQ1+ltRE0g8AoyGKKVcgZgSmLeppnobu6bf2+XmWY=";
+    hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ=";
   };
 
   postPatch = ''
@@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec {
     defusedxml
     passlib
     vobject
+    pika
     python-dateutil
     pytz # https://github.com/Kozea/Radicale/issues/816
   ] ++ passlib.optional-dependencies.bcrypt;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39a3dcd715e3..d5f37d82e0fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26584,9 +26584,7 @@ with pkgs;
   };
 
   radicale2 = callPackage ../servers/radicale/2.x.nix { };
-  radicale3 = callPackage ../servers/radicale/3.x.nix { };
-
-  radicale = radicale3;
+  radicale3 = radicale;
 
   qcal = callPackage ../tools/networking/qcal/default.nix { };