From 470fc224b7d2558bbf2634fbd01fee73613b765c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Jan 2021 10:48:32 +0100 Subject: [PATCH 1/3] radicale: 3.0.5 -> 3.0.6 --- pkgs/servers/radicale/3.x.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 4b49b1e40c82..bd781d869e96 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; [ From 7c1eee3b8e0f21129705a43cf20b5d7960e6d9b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Jan 2021 13:30:14 +0100 Subject: [PATCH 2/3] etesync-dav: 0.30.6 -> 0.30.7 --- pkgs/applications/misc/etesync-dav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index 0cbb3cc75a7e..f9deb188d3f5 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -2,11 +2,11 @@ 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; [ From 6cb37d21a3d8cbff0466756cb984be423225dc89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 16 Jan 2021 14:33:10 +0100 Subject: [PATCH 3/3] etesync-dav: mark as broken on Darwin --- pkgs/applications/misc/etesync-dav/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index f9deb188d3f5..ba3568f862c4 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, radicale3 }: +{ lib, stdenv, python3Packages, radicale3 }: python3Packages.buildPythonApplication rec { pname = "etesync-dav"; @@ -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 }; }