From 0dc1c7294c13f5d1dd6eccab4f75d268d7296efe Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Sat, 31 Aug 2024 19:16:54 +0300
Subject: [PATCH] etesync-dav: 0.32.1 -> 0.32.1-unstable-2024-09-02

Diff: https://github.com/etesync/etesync-dav/compare/v0.32.1...b9b23bf6fba60d42012008ba06023bccd9109c08

- contains commit pulled previously pulled with fetchpatch:
https://www.github.com/etesync/etesync-dav/commit/040cb7b57205e70515019fb356e508a6414da11e
- contains commit with changes to log.set_level() from radicale 3.2.2
update (additional second arg - backtrace_on_debug):
https://www.github.com/Kozea/Radicale/pull/1519
https://www.github.com/etesync/etesync-dav/pull/318
---
 .../applications/misc/etesync-dav/default.nix | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix
index 85ff399ac83f..6b68334f20f4 100644
--- a/pkgs/applications/misc/etesync-dav/default.nix
+++ b/pkgs/applications/misc/etesync-dav/default.nix
@@ -1,29 +1,22 @@
 { lib
 , stdenv
-, fetchpatch
 , nixosTests
 , python3
-, fetchPypi
+, fetchFromGitHub
 , radicale3
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication {
   pname = "etesync-dav";
-  version = "0.32.1";
+  version = "0.32.1-unstable-2024-09-02";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-pOLug5MnVdKaw5wedABewomID9LU0hZPCf4kZKKU1yA=";
+  src = fetchFromGitHub {
+    owner = "etesync";
+    repo = "etesync-dav";
+    rev = "b9b23bf6fba60d42012008ba06023bccd9109c08";
+    hash = "sha256-wWhwnOlwE1rFgROTSj90hlSw4k48fIEdk5CJOXoecuQ=";
   };
 
-  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 python3.pkgs; [
     appdirs
     etebase