3 files changed, 25 insertions, 116 deletions

diff --git a/overlays/etesync-dav/000-fix-setup-py.patch b/overlays/etesync-dav/000-fix-setup-py.patch
new file mode 100644
index 00000000..00107feb
--- /dev/null
+++ b/overlays/etesync-dav/000-fix-setup-py.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index a69cd1a..77c7fc5 100644
+--- a/setup.py
++++ b/setup.py
+@@ -115,7 +115,7 @@ INSTALL_REQUIRES = [
+     'Flask>=1.1.1',
+     'Flask-WTF>=0.14.2,<1.0.0',
+     'requests[socks]>=2.21',
+-    'types-setuptools>=50.0.0'
++    'types-setuptools>=50.0.0',
+     'pyobjc-framework-Cocoa>=7.0.0 ; sys_platform=="darwin"',
+ ]
+ 
diff --git a/overlays/etesync-dav/default.nix b/overlays/etesync-dav/default.nix
index 378fa753..963c34e2 100644
--- a/overlays/etesync-dav/default.nix
+++ b/overlays/etesync-dav/default.nix
@@ -1,55 +1,15 @@
 { final, prev, ... }: {
-  etesync-dav =
-    let
-      inherit (final) lib stdenv python39 radicale3 callPackage;
-
-      python = python39.override {
-        packageOverrides = self: super: {
-          flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec {
-            version = "0.15.1";
-            src = old.src.override {
-              inherit version;
-              sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc";
-            };
-            doCheck = false;
-            disabledTests = [
-              "test_outside_request"
-            ];
-            patches = [ ];
-          });
-          etebase = python.pkgs.callPackage ./etebase.nix { python39 = python; openssl = final.openssl_1_1; };
-        };
-      };
-    in python.pkgs.buildPythonApplication rec {
-      pname = "etesync-dav";
-      version = "0.32.1";
-
-      src = python.pkgs.fetchPypi {
-        inherit pname version;
-        sha256 = "a4e2ee83932755d29ac39c1e74005ec289880fd2d4d2164f09fe2464a294d720";
-      };
-
-      propagatedBuildInputs = with python.pkgs; [
-        appdirs
-        etebase
-        etesync
-        flask
-        flask-wtf
-        msgpack
-        pysocks
-        setuptools
-        (python.pkgs.toPythonModule (radicale3.override { python3 = python; }))
-        requests
-      ] ++ requests.optional-dependencies.socks;
-
-      doCheck = false;
-
-      meta = with lib; {
-        homepage = "https://www.etesync.com/";
-        description = "Secure, end-to-end encrypted, and privacy respecting sync for contacts, calendars and tasks";
-        license = licenses.gpl3;
-        maintainers = with maintainers; [ thyol valodim ];
-        broken = stdenv.isDarwin; # pyobjc-framework-Cocoa is missing
-      };
+  etesync-dav = prev.etesync-dav.overrideAttrs (oldAttrs: rec {
+    version = "0.32.1";
+    src = prev.fetchFromGitHub {
+      owner = "etesync";
+      repo = "etesync-dav";
+      rev = "108c23abf0f036522af38411bced50c4f6c0a731";
+      hash = "sha256-w0EuU+E9B2fp5/WfI/KJ8i1AuV4JHWNdZ8o6aopqrfs=";
     };
+    patches = (oldAttrs.patches or []) ++ [ ./000-fix-setup-py.patch ];
+    propagatedBuildInputs = (oldAttrs.propagatedBuildInputs or []) ++ [
+      prev.python3.pkgs.types-setuptools
+    ];
+  });
 }
diff --git a/overlays/etesync-dav/etebase.nix b/overlays/etesync-dav/etebase.nix
deleted file mode 100644
index 8711725c..00000000
--- a/overlays/etesync-dav/etebase.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, python39
-, rustPlatform
-, pkg-config
-, rustfmt
-, setuptools-rust
-, openssl
-, msgpack
-}:
-
-python39.pkgs.buildPythonPackage rec {
-  pname = "etebase";
-  version = "0.31.6";
-
-  src = fetchFromGitHub {
-    owner = "etesync";
-    repo = "etebase-py";
-    rev = "v${version}";
-    hash = "sha256-T61nPW3wjBRjmJ81w59T1b/Kxrwwqvyj3gILE9OF/5Q=";
-  };
-
-  cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit src;
-    name = "${pname}-${version}";
-    hash = "sha256-wrMNtcaLAsWBVeJbYbYo+Xmobl01lnUbR9NUqqUzUgU=";
-  };
-
-  format = "pyproject";
-
-  nativeBuildInputs = [
-    pkg-config
-    rustfmt
-    setuptools-rust
-  ] ++ (with rustPlatform; [
-    cargoSetupHook
-    rust.cargo
-    rust.rustc
-  ]);
-
-  buildInputs = [ openssl ];
-
-  propagatedBuildInputs = [
-    msgpack
-  ];
-
-  postPatch = ''
-    # Use system OpenSSL, which gets security updates.
-    substituteInPlace Cargo.toml \
-      --replace ', features = ["vendored"]' ""
-  '';
-
-  pythonImportsCheck = [ "etebase" ];
-
-
-  meta = with lib; {
-    broken = stdenv.isDarwin;
-    homepage = "https://www.etebase.com/";
-    description = "A Python client library for Etebase";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ _3699n thyol ];
-  };
-}