From 979e49fb31d5cf1bc528bdbad4884eeb7b67decd Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 15 Jul 2025 10:35:35 +0200
Subject: ...

---
 overlays/etesync-dav.nix             | 47 +++++++++---------------------------
 overlays/prometheus-lvm-exporter.nix |  2 +-
 overlays/spice-record.nix            |  2 ++
 overlays/swayosd/default.nix         |  2 +-
 4 files changed, 15 insertions(+), 38 deletions(-)

(limited to 'overlays')

diff --git a/overlays/etesync-dav.nix b/overlays/etesync-dav.nix
index cec216e2..f7a5146f 100644
--- a/overlays/etesync-dav.nix
+++ b/overlays/etesync-dav.nix
@@ -1,54 +1,29 @@
 { final, prev, ... }: {
-  etesync-dav = prev.python3Packages.buildPythonApplication rec {
+  etesync-dav = final.python3Packages.buildPythonApplication rec {
     pname = "etesync-dav";
-    version = "0.33.4";
+    version = "0.35.0";
+    format = "pyproject";
 
     src = prev.fetchFromGitHub {
       owner = "etesync";
       repo = "etesync-dav";
-      rev = "v${version}";
-      hash = "sha256-g+rK762tSWPDaBsaTwpTzfK/lqVs+Z/Qrpq2HCpipQE=";
+      tag = "v${version}";
+      hash = "sha256-CD02nuA9GD/oe7mjExUHIftkPxM1pZQKyDalXSoOhXY=";
     };
 
-    dependencies = with prev.python3Packages; [
+    build-system = with final.python3Packages; [ setuptools ];
+
+    pythonRelaxDeps = [ "radicale" ];
+
+    dependencies = with final.python3Packages; [
       appdirs
       etebase
       etesync
       flask
       flask-wtf
       msgpack
-      setuptools
-      (toPythonModule (buildPythonApplication rec {
-        pname = "radicale";
-        version = "3.2.3";
-        pyproject = true;
-
-        src = prev.fetchFromGitHub {
-          owner = "Kozea";
-          repo = "Radicale";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-1IlnXVetQQuKBt6+QVKNeMM6qBQAiUhqc+4x3xOnSdE=";
-        };
-
-        build-system = [
-          setuptools
-        ];
-
-        dependencies =
-          [
-            defusedxml
-            passlib
-            vobject
-            pika
-            python-dateutil
-            pytz # https://github.com/Kozea/Radicale/issues/816
-          ]
-          ++ passlib.optional-dependencies.bcrypt;
-
-        doCheck = false;
-      }))
+      (final.python3Packages.toPythonModule (final.radicale.override { inherit (final) python3; }))
       requests
-      types-setuptools
       requests.optional-dependencies.socks
     ];
 
diff --git a/overlays/prometheus-lvm-exporter.nix b/overlays/prometheus-lvm-exporter.nix
index b0230b63..cae45003 100644
--- a/overlays/prometheus-lvm-exporter.nix
+++ b/overlays/prometheus-lvm-exporter.nix
@@ -3,7 +3,7 @@
     pname = "prometheus-lvm-exporter";
     inherit (sources.prometheus-lvm-exporter) version src;
 
-    vendorHash = "sha256-5H99RpUV3QV1hithBN7ztJlZdBi+SlaKegga8jDs0AM=";
+    vendorHash = "sha256-QpJM11Rg+TUV0GWYlvIkwuQqiTsfSdQNtPpD6zT08ew=";
 
     doCheck = false;
 
diff --git a/overlays/spice-record.nix b/overlays/spice-record.nix
index 06a114da..2d37079b 100644
--- a/overlays/spice-record.nix
+++ b/overlays/spice-record.nix
@@ -8,5 +8,7 @@
       wrapProgram $out/bin/spice-record \
         --prefix PATH : ${prev.lib.makeBinPath (with prev; [ ffmpeg-full ])}
     '';
+    pyproject = true;
+    build-system = [ prev.python3Packages.setuptools ];
   };
 }
diff --git a/overlays/swayosd/default.nix b/overlays/swayosd/default.nix
index b4601a03..5e715dae 100644
--- a/overlays/swayosd/default.nix
+++ b/overlays/swayosd/default.nix
@@ -4,7 +4,7 @@
     cargoDeps = prev.rustPlatform.fetchCargoVendor {
       inherit (oldAttrs) pname;
       inherit version src;
-      hash = "sha256-yWybf4GKxHrk4WrW5SmjfPD0Gv79tpXOwNLlWeykYy0=";
+      hash = "sha256-J2sl6/4+bRWlkvaTJtFsMqvvOxYtWLRjJcYWcu0loRE=";
     };
     patches = (oldAttrs.patches or []) ++ [
       ./exponential.patch
-- 
cgit v1.2.3