From 7bd33c314fe8610db5f3645f552b76c70694d163 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Mon, 9 Dec 2024 05:09:50 +0800
Subject: [PATCH 1/2] etesync-dav: format

---
 pkgs/by-name/et/etesync-dav/package.nix | 52 ++++++++++++++-----------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/et/etesync-dav/package.nix b/pkgs/by-name/et/etesync-dav/package.nix
index 00b9c2227b90b..56496205babce 100644
--- a/pkgs/by-name/et/etesync-dav/package.nix
+++ b/pkgs/by-name/et/etesync-dav/package.nix
@@ -1,11 +1,11 @@
-{ lib
-, stdenv
-, nixosTests
-, python3
-, fetchFromGitHub
-, radicale
+{
+  lib,
+  stdenv,
+  nixosTests,
+  python3,
+  fetchFromGitHub,
+  radicale,
 }:
-
 python3.pkgs.buildPythonApplication {
   pname = "etesync-dav";
   version = "0.32.1-unstable-2024-09-02";
@@ -17,18 +17,21 @@ python3.pkgs.buildPythonApplication {
     hash = "sha256-wWhwnOlwE1rFgROTSj90hlSw4k48fIEdk5CJOXoecuQ=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
-    appdirs
-    etebase
-    etesync
-    flask
-    flask-wtf
-    msgpack
-    setuptools
-    (python.pkgs.toPythonModule (radicale.override { python3 = python; }))
-    requests
-    types-setuptools
-  ] ++ requests.optional-dependencies.socks;
+  propagatedBuildInputs =
+    with python3.pkgs;
+    [
+      appdirs
+      etebase
+      etesync
+      flask
+      flask-wtf
+      msgpack
+      setuptools
+      (python.pkgs.toPythonModule (radicale.override { python3 = python; }))
+      requests
+      types-setuptools
+    ]
+    ++ requests.optional-dependencies.socks;
 
   doCheck = false;
 
@@ -36,12 +39,15 @@ python3.pkgs.buildPythonApplication {
     inherit (nixosTests) etesync-dav;
   };
 
-  meta = with lib; {
-    homepage = "https://www.etesync.com/";
+  meta = {
+    homepage = "https://www.etesync.com";
     description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks";
     mainProgram = "etesync-dav";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ thyol valodim ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [
+      thyol
+      valodim
+    ];
     broken = stdenv.hostPlatform.isDarwin; # pyobjc-framework-Cocoa is missing
   };
 }

From e8ee2d42c6da74575cc969be9e1be579a799bc32 Mon Sep 17 00:00:00 2001
From: aucub <78630225+aucub@users.noreply.github.com>
Date: Mon, 9 Dec 2024 05:12:54 +0800
Subject: [PATCH 2/2] etesync-dav: 0.32.1-unstable-2024-09-02 -> 0.33.4

---
 pkgs/by-name/et/etesync-dav/package.nix | 40 ++++++++++++-------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/et/etesync-dav/package.nix b/pkgs/by-name/et/etesync-dav/package.nix
index 56496205babce..f0c0e1c6a3fc7 100644
--- a/pkgs/by-name/et/etesync-dav/package.nix
+++ b/pkgs/by-name/et/etesync-dav/package.nix
@@ -2,36 +2,34 @@
   lib,
   stdenv,
   nixosTests,
-  python3,
+  python3Packages,
   fetchFromGitHub,
   radicale,
 }:
-python3.pkgs.buildPythonApplication {
+python3Packages.buildPythonApplication rec {
   pname = "etesync-dav";
-  version = "0.32.1-unstable-2024-09-02";
+  version = "0.33.4";
 
   src = fetchFromGitHub {
     owner = "etesync";
     repo = "etesync-dav";
-    rev = "b9b23bf6fba60d42012008ba06023bccd9109c08";
-    hash = "sha256-wWhwnOlwE1rFgROTSj90hlSw4k48fIEdk5CJOXoecuQ=";
+    tag = "v${version}";
+    hash = "sha256-g+rK762tSWPDaBsaTwpTzfK/lqVs+Z/Qrpq2HCpipQE=";
   };
 
-  propagatedBuildInputs =
-    with python3.pkgs;
-    [
-      appdirs
-      etebase
-      etesync
-      flask
-      flask-wtf
-      msgpack
-      setuptools
-      (python.pkgs.toPythonModule (radicale.override { python3 = python; }))
-      requests
-      types-setuptools
-    ]
-    ++ requests.optional-dependencies.socks;
+  dependencies = with python3Packages; [
+    appdirs
+    etebase
+    etesync
+    flask
+    flask-wtf
+    msgpack
+    setuptools
+    (python3Packages.toPythonModule (radicale.override { python3 = python; }))
+    requests
+    types-setuptools
+    requests.optional-dependencies.socks
+  ];
 
   doCheck = false;
 
@@ -43,7 +41,7 @@ python3.pkgs.buildPythonApplication {
     homepage = "https://www.etesync.com";
     description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks";
     mainProgram = "etesync-dav";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [
       thyol
       valodim