From 32cc037ff6084f7163cc68914e75fbb60dab4502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Apr 2023 12:49:00 -0700 Subject: [PATCH 1/2] etesync-dav: fix build --- pkgs/applications/misc/etesync-dav/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index a301b12506c9..b1fb1fea467c 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , python3 , radicale3 }: @@ -47,6 +48,14 @@ in python.pkgs.buildPythonApplication rec { hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA="; }; + patches = [ + (fetchpatch { + name = "add-missing-comma-in-setup.py.patch"; + url = "https://github.com/etesync/etesync-dav/commit/040cb7b57205e70515019fb356e508a6414da11e.patch"; + hash = "sha256-87IpIQ87rgpinvbRwUlWd0xeegn0zfVSiDFYNUqPerg="; + }) + ]; + propagatedBuildInputs = with python.pkgs; [ appdirs etebase @@ -57,6 +66,7 @@ in python.pkgs.buildPythonApplication rec { setuptools (python.pkgs.toPythonModule (radicale3.override { python3 = python; })) requests + types-setuptools ] ++ requests.optional-dependencies.socks; doCheck = false; From 1bb2506ed94d12380b10702f9f37294eb3987e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 29 Apr 2023 12:51:27 -0700 Subject: [PATCH 2/2] etesync-dav: add passthru.tests --- pkgs/applications/misc/etesync-dav/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix index b1fb1fea467c..abf01ff83950 100644 --- a/pkgs/applications/misc/etesync-dav/default.nix +++ b/pkgs/applications/misc/etesync-dav/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchpatch +, nixosTests , python3 , radicale3 }: @@ -71,6 +72,10 @@ in python.pkgs.buildPythonApplication rec { doCheck = false; + passthru.tests = { + inherit (nixosTests) etesync-dav; + }; + meta = with lib; { homepage = "https://www.etesync.com/"; description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks";