about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/applications/misc/etesync-dav/default.nix7
-rw-r--r--pkgs/servers/radicale/3.x.nix15
2 files changed, 10 insertions, 12 deletions
diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix
index 0cbb3cc75a7eb..ba3568f862c40 100644
--- a/pkgs/applications/misc/etesync-dav/default.nix
+++ b/pkgs/applications/misc/etesync-dav/default.nix
@@ -1,12 +1,12 @@
-{ lib, python3Packages, radicale3 }:
+{ lib, stdenv, python3Packages, radicale3 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "etesync-dav";
-  version = "0.30.6";
+  version = "0.30.7";
 
   src = python3Packages.fetchPypi {
     inherit pname version;
-    sha256 = "0cjz4p3a750fwvrxbzwda0sidw7nscahvppdshbsx49i6qrczpbg";
+    sha256 = "16b3105834dd6d9e374e976cad0978e1acfed0f0328c5054bc214550aea3e2c5";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -24,5 +24,6 @@ python3Packages.buildPythonApplication rec {
     description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks";
     license = licenses.gpl3;
     maintainers = with maintainers; [ valodim ];
+    broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing
   };
 }
diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix
index 4b49b1e40c822..bd781d869e968 100644
--- a/pkgs/servers/radicale/3.x.nix
+++ b/pkgs/servers/radicale/3.x.nix
@@ -1,15 +1,12 @@
-{ lib, python3, fetchFromGitHub }:
+{ lib, python3 }:
 
 python3.pkgs.buildPythonApplication rec {
-  pname = "radicale";
-  version = "3.0.5";
+  pname = "Radicale";
+  version = "3.0.6";
 
-  # No tests in PyPI tarball
-  src = fetchFromGitHub {
-    owner = "Kozea";
-    repo = "Radicale";
-    rev = version;
-    sha256 = "0w8qkjm7b62cr49dbis41kvv3179sfmvvzlhlc0rbqss6vmwbq4p";
+  src = python3.pkgs.fetchPypi {
+    inherit pname version;
+    sha256 = "a9433d3df97135d9c02cec8dde4199444daf1b73ad161ded398d67b8e629fdc6";
   };
 
   propagatedBuildInputs = with python3.pkgs; [