radicale: 3.3.0 -> 3.3.1 (#358813)

Author: erictapen

pkgs/by-name/ra/radicale/package.nix

@@ -1,33 +1,37 @@
-{ lib
-, python3
-, fetchFromGitHub
-, nixosTests
+{
+  fetchFromGitHub,
+  lib,
+  nixosTests,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "radicale";
-  version = "3.3.0";
+  version = "3.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "Radicale";
     rev = "refs/tags/v${version}";
-    hash = "sha256-S9/bPgItbr6rRr4WX+hmyU1RvKn5gz9FdZjYlr0hnd0=";
+    hash = "sha256-vHg5faXx7ILiI3tpQ38yxF96DzS7EZCSRHfIW9QbI9Q=";
   };
 
   build-system = with python3.pkgs; [
     setuptools
   ];
 
-  dependencies = with python3.pkgs; [
-    defusedxml
-    passlib
-    vobject
-    pika
-    python-dateutil
-    pytz # https://github.com/Kozea/Radicale/issues/816
-  ] ++ passlib.optional-dependencies.bcrypt;
+  dependencies =
+    with python3.pkgs;
+    [
+      defusedxml
+      passlib
+      vobject
+      pika
+      python-dateutil
+      pytz # https://github.com/Kozea/Radicale/issues/816
+    ]
+    ++ passlib.optional-dependencies.bcrypt;
 
   __darwinAllowLocalNetworking = true;
 
@@ -40,11 +44,14 @@ python3.pkgs.buildPythonApplication rec {
     inherit (nixosTests) radicale;
   };
 
-  meta = with lib; {
+  meta = {
     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 ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      dotlambda
+      erictapen
+    ];
   };
 }

pkgs/development/python-modules/radicale-infcloud/default.nix

@@ -3,12 +3,13 @@
   fetchFromGitHub,
   buildPythonPackage,
   radicale,
+  setuptools,
 }:
 
 buildPythonPackage {
   pname = "radicale-infcloud";
   version = "unstable-2022-04-18";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Unrud";
@@ -17,7 +18,9 @@ buildPythonPackage {
     hash = "sha256-xzBWIx2OOkCtBjlff1Z0VqgMhxWtgiOKutXUadT3tIo=";
   };
 
-  propagatedBuildInputs = [ radicale ];
+  build-system = [ setuptools ];
+
+  dependencies = [ radicale ];
 
   # has no tests
   doCheck = false;
@@ -29,7 +32,7 @@ buildPythonPackage {
     description = "Integrate InfCloud into Radicale's web interface";
     license = with licenses; [
       agpl3Plus
-      gpl3
+      gpl3Plus
     ];
     maintainers = with maintainers; [ erictapen ];
   };