Unverified Commit 45ea03e0 authored by Kerstin's avatar Kerstin Committed by GitHub
Browse files

Merge pull request #309094 from pyrox0/radicale-3.2.0 

radicale: 3.1.9 -> 3.2.0
parents 7177b83a 149c810d

pkgs/servers/radicale/3.x.nix→pkgs/by-name/ra/radicale/package.nix

+3 −2
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "radicale";

  version = "3.1.9";

  version = "3.2.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "Kozea";

    repo = "Radicale";

    rev = "v${version}";

    hash = "sha256-i4NQ1+ltRE0g8AoyGKKVcgZgSmLeppnobu6bf2+XmWY=";

    hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ=";

  };



  postPatch = ''
@@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { 
    defusedxml

    passlib

    vobject

    pika

    python-dateutil

    pytz # https://github.com/Kozea/Radicale/issues/816

  ] ++ passlib.optional-dependencies.bcrypt;

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -26580,9 +26580,7 @@ with pkgs; 
  };















  radicale2 = callPackage ../servers/radicale/2.x.nix { };













  radicale3 = callPackage ../servers/radicale/3.x.nix { };

























  radicale = radicale3;













  radicale3 = radicale;





























  qcal = callPackage ../tools/networking/qcal/default.nix { };