diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-24 11:04:41 +0100 |
commit | 5423cabbbf2b6dec5568f1ecabd288d5d9a642ec (patch) | |
tree | f316a6a921bfefd3a63bd4502c2eb50ff1644f67 /nixpkgs/pkgs/servers/radicale/3.x.nix | |
parent | 46a88117a05c3469af5d99433af140c3de8ca088 (diff) | |
parent | 8aa81f34981add12aecada6c702ddbbd0375ca36 (diff) | |
download | nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.gz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.bz2 nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.lz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.xz nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.tar.zst nixlib-5423cabbbf2b6dec5568f1ecabd288d5d9a642ec.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/servers/radicale/3.x.nix')
-rw-r--r-- | nixpkgs/pkgs/servers/radicale/3.x.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/servers/radicale/3.x.nix b/nixpkgs/pkgs/servers/radicale/3.x.nix index 3df1ae7c4d1d..92db274bf708 100644 --- a/nixpkgs/pkgs/servers/radicale/3.x.nix +++ b/nixpkgs/pkgs/servers/radicale/3.x.nix @@ -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 @@ -44,12 +39,18 @@ python3.pkgs.buildPythonApplication rec { waitress ]; + pytestFlagsArray = [ + # pytest.PytestRemovedIn8Warning: Support for nose tests is deprecated and will be removed in a future release. + "-W" "ignore::pytest.PytestRemovedIn8Warning" + ]; + passthru.tests = { inherit (nixosTests) radicale; }; 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 ]; |