radicale2: drop (#360284)

pkgs/by-name/et/etesync-dav/package.nix

@@ -3,7 +3,7 @@
 , nixosTests
 , python3
 , fetchFromGitHub
-, radicale3
+, radicale
 }:
 
 python3.pkgs.buildPythonApplication {
@@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication {
     flask-wtf
     msgpack
     setuptools
-    (python.pkgs.toPythonModule (radicale3.override { python3 = python; }))
+    (python.pkgs.toPythonModule (radicale.override { python3 = python; }))
     requests
     types-setuptools
   ] ++ requests.optional-dependencies.socks;

pkgs/servers/radicale/2.x.nix

@@ -1,51 +0,0 @@
-{ lib, fetchFromGitHub, python3 }:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "Radicale";
-  version = "2.1.12";
-
-  # No tests in PyPI tarball
-  src = fetchFromGitHub {
-    owner = "Kozea";
-    repo = "Radicale";
-    rev = version;
-    sha256 = "14f9ql0fiwapaa4xaslwgk1ah9fzxxan2p1p2rxb4a5iqph1z0cl";
-  };
-
-  # We only want functional tests
-  postPatch = ''
-    sed -i "s/pytest-cov\|pytest-flake8\|pytest-isort//g" setup.py
-    sed -i "/^addopts/d" setup.cfg
-  '';
-
-  propagatedBuildInputs = with python3.pkgs; [
-    vobject
-    python-dateutil
-    passlib
-    setuptools
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [
-    pytestCheckHook
-  ];
-
-  disabledTests = [
-    # uses unsupported crypt method
-    "test_htpasswd_crypt"
-  ];
-
-  meta = with lib; {
-    homepage = "https://radicale.org/v2.html";
-    description = "CalDAV CardDAV server";
-    mainProgram = "radicale";
-    longDescription = ''
-      The Radicale Project is a complete CalDAV (calendar) and CardDAV
-      (contact) server solution. Calendars and address books are available for
-      both local and remote access, possibly limited through authentication
-      policies. They can be viewed and edited by calendar and contact clients
-      on mobile phones or computers.
-    '';
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ edwtjo pSub ];
-  };
-}

pkgs/top-level/aliases.nix

@@ -1079,6 +1079,8 @@ mapAliases {
 
   rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15
   radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17
+  radicale2 = throw "'radicale2' was removed because it was broken. Use 'radicale' (version 3) instead"; # Added 2024-11-29
+  radicale3 = radicale; # Added 2024-11-29
   radicle-cli = throw "'radicle-cli' was removed in favor of 'radicle-node'"; # Added 2024-05-04
   radicle-upstream = throw "'radicle-upstream' was sunset, see <https://community.radworks.org/t/2962>"; # Added 2024-05-04
   railway-travel = diebahn; # Added 2024-04-01

pkgs/top-level/all-packages.nix

@@ -12136,9 +12136,6 @@ with pkgs;
     elixir = pkgs.elixir.override { inherit erlang; };
   };
 
-  radicale2 = callPackage ../servers/radicale/2.x.nix { };
-  radicale3 = radicale;
-
   qcal = callPackage ../tools/networking/qcal/default.nix { };
 
   rake = callPackage ../development/tools/build-managers/rake { };