From 7e8137033ccb9b55120d6936025f1e35101c247c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Nov 2024 18:36:33 -0800 Subject: [PATCH 1/2] radicale2: drop It is broken in master and release-24.05. --- pkgs/servers/radicale/2.x.nix | 51 --------------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 3 files changed, 1 insertion(+), 52 deletions(-) delete mode 100644 pkgs/servers/radicale/2.x.nix diff --git a/pkgs/servers/radicale/2.x.nix b/pkgs/servers/radicale/2.x.nix deleted file mode 100644 index 23195338641f..000000000000 --- a/pkgs/servers/radicale/2.x.nix +++ /dev/null @@ -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 ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6fdda136f76d..6cdf9663d6f8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1077,6 +1077,7 @@ 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 radicle-cli = throw "'radicle-cli' was removed in favor of 'radicle-node'"; # Added 2024-05-04 radicle-upstream = throw "'radicle-upstream' was sunset, see "; # Added 2024-05-04 railway-travel = diebahn; # Added 2024-04-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27331b8f8b4f..023bde4c0ada 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12139,7 +12139,6 @@ with pkgs; erlang = erlang_26; }; - radicale2 = callPackage ../servers/radicale/2.x.nix { }; radicale3 = radicale; qcal = callPackage ../tools/networking/qcal/default.nix { }; From 6bff67cfbb52664816bc1c67e642e1c0c0ca64e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Nov 2024 18:40:24 -0800 Subject: [PATCH 2/2] radicale3: move to aliases --- pkgs/by-name/et/etesync-dav/package.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/et/etesync-dav/package.nix b/pkgs/by-name/et/etesync-dav/package.nix index 1758dde546ea..00b9c2227b90 100644 --- a/pkgs/by-name/et/etesync-dav/package.nix +++ b/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; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6cdf9663d6f8..93a0e4224d10 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1078,6 +1078,7 @@ 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 "; # Added 2024-05-04 railway-travel = diebahn; # Added 2024-04-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 023bde4c0ada..4532a81787ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12139,8 +12139,6 @@ with pkgs; erlang = erlang_26; }; - radicale3 = radicale; - qcal = callPackage ../tools/networking/qcal/default.nix { }; rake = callPackage ../development/tools/build-managers/rake { };