From 1f53d0a9f2e19745500f8b181e027ef7deca8351 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Wed, 6 Nov 2024 15:31:15 +0100
Subject: [PATCH] xandikos: 0.12.1 -> 0.12.2 (#352604)

* xandikos: 0.2.11 -> 0.2.12

* xandikos: move to pkgs/by-name
---
 .../xa/xandikos/package.nix}                       | 14 ++------------
 pkgs/top-level/all-packages.nix                    |  2 --
 2 files changed, 2 insertions(+), 14 deletions(-)
 rename pkgs/{servers/xandikos/default.nix => by-name/xa/xandikos/package.nix} (70%)

diff --git a/pkgs/servers/xandikos/default.nix b/pkgs/by-name/xa/xandikos/package.nix
similarity index 70%
rename from pkgs/servers/xandikos/default.nix
rename to pkgs/by-name/xa/xandikos/package.nix
index d86ff503e803..cfaeef7b1315 100644
--- a/pkgs/servers/xandikos/default.nix
+++ b/pkgs/by-name/xa/xandikos/package.nix
@@ -1,6 +1,5 @@
 {
   fetchFromGitHub,
-  fetchpatch2,
   lib,
   nixosTests,
   python3Packages,
@@ -8,7 +7,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "xandikos";
-  version = "0.2.11";
+  version = "0.2.12";
   pyproject = true;
 
   disabled = python3Packages.pythonOlder "3.9";
@@ -17,18 +16,9 @@ python3Packages.buildPythonApplication rec {
     owner = "jelmer";
     repo = "xandikos";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cBsceJ6tib8OYx5L2Hv2AqRS+ADRSLIuJGIULNpAmEI=";
+    hash = "sha256-wdEwIVN9dkLVj8oe+2eh5n258pZRfKgLgzVCmwafCis=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "fix-compatibility-with-icalendar-v6.patch";
-      url = "https://github.com/jelmer/xandikos/commit/ae8924c374ed86b2efde5bfbc75e56f6d8318086.patch";
-      excludes = [ "requirements.txt" ];
-      hash = "sha256-PCKo5C6Ejw9ZsFFLAMw1ZtMoCq9gJxR65K7CM6RUYwU=";
-    })
-  ];
-
   build-system = with python3Packages; [
     setuptools
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 836b52446104..320702770745 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23331,8 +23331,6 @@ with pkgs;
 
   x265 = callPackage ../development/libraries/x265 { };
 
-  xandikos = callPackage ../servers/xandikos { };
-
   inherit (callPackages ../development/libraries/xapian { })
     xapian_1_4;
   xapian = xapian_1_4;