...flakes

2 files changed, 30 insertions, 2 deletions

diff --git a/overlays/etesync-dav.nix b/overlays/etesync-dav.nix
index 64f30071..7ed1a5ee 100644
--- a/overlays/etesync-dav.nix
+++ b/overlays/etesync-dav.nix
@@ -32,7 +32,35 @@
       flask-wtf
       msgpack
       requests
-      (toPythonModule (final.radicale.override { python3 = python; }))
+      (buildPythonApplication rec {
+        pname = "radicale";
+        version = "3.2.0";
+        pyproject = true;
+
+        src = prev.fetchFromGitHub {
+          owner = "Kozea";
+          repo = "Radicale";
+          rev = "refs/tags/v${version}";
+          hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ=";
+        };
+
+        postPatch = ''
+          sed -i '/addopts/d' setup.cfg
+        '';
+
+        build-system = [
+          setuptools
+        ];
+
+        dependencies = [
+          defusedxml
+          passlib
+          vobject
+          pika
+          python-dateutil
+          pytz # https://github.com/Kozea/Radicale/issues/816
+        ] ++ passlib.optional-dependencies.bcrypt;
+      })
     ] ++ requests.optional-dependencies.socks;
 
     doCheck = false;
diff --git a/overlays/lesspipe.nix b/overlays/lesspipe.nix
index b791f6e5..fdcd2582 100644
--- a/overlays/lesspipe.nix
+++ b/overlays/lesspipe.nix
@@ -17,7 +17,7 @@
 
     preFixup = ''
       wrapProgram $out/bin/lesspipe.sh \
-        --prefix PATH : ${prev.lib.makeBinPath (with final; [ file ncurses binutils ])}
+        --prefix PATH : ${prev.lib.makeBinPath (with final; [ csvkit file ncurses binutils ])}
     '';
   };
 }