1 files changed, 17 insertions, 25 deletions

diff --git a/modules/zfssnap/default.nix b/modules/zfssnap/default.nix
index 42cdf46f..735e73ec 100644
--- a/modules/zfssnap/default.nix
+++ b/modules/zfssnap/default.nix
@@ -1,32 +1,20 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, flakeInputs, ... }:
 
 with lib;
 
 let
-  zfssnap = pkgs.stdenv.mkDerivation rec {
-    name = "zfssnap";
-    src = ./zfssnap.py;
+  zfssnap = flakeInputs.mach-nix.lib.${config.nixpkgs.system}.buildPythonPackage rec {
+    pname = "zfssnap";
+    src = ./zfssnap;
+    version = "0.0.0";
+    ignoreDataOutdated = true;
 
-    phases = [ "buildPhase" "checkPhase" "installPhase" ];
-
-    buildInputs = with pkgs; [makeWrapper];
-
-    python = pkgs.python39.withPackages (ps: with ps; [pyxdg pytimeparse python-dateutil]);
-
-    buildPhase = ''
-      substitute $src zfssnap \
-        --subst-var-by python ${escapeShellArg python}
-    '';
-
-    doCheck = true;
-    checkPhase = ''
-      ${python}/bin/python -m py_compile zfssnap
+    requirements = ''
+      pyxdg
+      pytimeparse
+      python-dateutil
     '';
-
-    installPhase = ''
-      install -m 0755 -D -t $out/bin \
-        zfssnap
-
+    postInstall = ''
       wrapProgram $out/bin/zfssnap \
         --prefix PATH : ${makeBinPath [config.boot.zfs.package]}
     '';
@@ -71,7 +59,9 @@ in {
       before = [ "zfssnap-prune.service" ];
       serviceConfig = {
         Type = "oneshot";
-        ExecStart = "${zfssnap}/bin/zfssnap -v";
+        ExecStart = "${zfssnap}/bin/zfssnap -vv";
+
+        LogRateLimitIntervalSec = 0;
       };
     };
     systemd.services."zfssnap-prune" = {
@@ -82,7 +72,9 @@ in {
         ExecStart = let
           mkSectionName = name: strings.escape [ "[" "]" ] (strings.toUpper name);
           zfssnapConfig = generators.toINI { inherit mkSectionName; } cfg.config;
-        in "${zfssnap}/bin/zfssnap -vv prune --config=${pkgs.writeText "zfssnap.ini" zfssnapConfig}";
+        in "${zfssnap}/bin/zfssnap -vv prune --exec-newest --config=${pkgs.writeText "zfssnap.ini" zfssnapConfig}"; # DEBUG
+
+        LogRateLimitIntervalSec = 0;
       };
     };