Skip to content

Commit

Permalink
Merge pull request NixOS#296945 from dotlambda/radicale
Browse files Browse the repository at this point in the history
radicale: 3.1.8 -> 3.1.9
  • Loading branch information
erictapen authored Mar 18, 2024
2 parents 183c912 + bc205b2 commit 46a8fba
Showing 1 changed file with 8 additions and 12 deletions.
20 changes: 8 additions & 12 deletions pkgs/servers/radicale/3.x.nix
Original file line number Diff line number Diff line change
@@ -1,34 +1,29 @@
{ lib
, python3
, fetchFromGitHub
, fetchpatch
, nixosTests
}:

python3.pkgs.buildPythonApplication rec {
pname = "radicale";
version = "3.1.8";
version = "3.1.9";
pyproject = true;

src = fetchFromGitHub {
owner = "Kozea";
repo = "Radicale";
rev = "v${version}";
hash = "sha256-V0nqgxGUxcTRAYFuxpKUEVB/g/Mbvw+9OIcvAexXwuM=";
hash = "sha256-i4NQ1+ltRE0g8AoyGKKVcgZgSmLeppnobu6bf2+XmWY=";
};

patches = [
# https://github.com/Kozea/Radicale/pull/1328
(fetchpatch {
name = "fix-python3.11-tests.patch";
url = "https://github.com/Kozea/Radicale/commit/110ec3a7885f523ce894a8c0e336c1a081dcd092.patch";
hash = "sha256-WEiwzJ+Vzv8PXmZUi1X7Qzs+oE6qgmpvHqm/xiOMrt0=";
})
];

postPatch = ''
sed -i '/addopts/d' setup.cfg
'';

nativeBuildInputs = with python3.pkgs; [
setuptools
];

propagatedBuildInputs = with python3.pkgs; [
defusedxml
passlib
Expand All @@ -50,6 +45,7 @@ python3.pkgs.buildPythonApplication rec {

meta = with lib; {
homepage = "https://radicale.org/v3.html";
changelog = "https://github.com/Kozea/Radicale/blob/${src.rev}/CHANGELOG.md";
description = "CalDAV and CardDAV server";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ dotlambda erictapen ];
Expand Down

0 comments on commit 46a8fba

Please sign in to comment.