bump

1 files changed, 15 insertions, 25 deletions

diff --git a/modules/borgcopy/default.nix b/modules/borgcopy/default.nix
index eae07dc8..afc6c37b 100644
--- a/modules/borgcopy/default.nix
+++ b/modules/borgcopy/default.nix
@@ -3,33 +3,23 @@
 with lib;
 
 let
-  copyBorg = flakeInputs.mach-nix.lib.${config.nixpkgs.system}.buildPythonPackage rec {
-    pname = "copy-borg";
-    src = ./copy;
-    version = "0.0.0";
-    ignoreDataOutdated = true;
+  copyBorg =
+    with pkgs.poetry2nix;
+    mkPoetryApplication {
+      projectDir = cleanPythonSources { src = ./.; };
 
-    requirements = ''
-      humanize
-      tqdm
-      python-dateutil
-      xdg
-      python-unshare
-      pyprctl
-      halo
-    '';
-    postInstall = ''
-      wrapProgram $out/bin/copy_borg \
-        --prefix PATH : ${makeBinPath (with pkgs; [util-linux borgbackup])}:${config.security.wrapperDir}
-    '';
-
-    providers.python-unshare = "nixpkgs";
-    overridesPre = [
-      (self: super: { python-unshare = super.python-unshare.overrideAttrs (oldAttrs: { name = "python-unshare-0.2.1"; version = "0.2.1"; }); })
-    ];
+      overrides = overrides.withDefaults (self: super: {
+        pyprctl = super.pyprctl.overridePythonAttrs (oldAttrs: {
+          buildInputs = (oldAttrs.buildInputs or []) ++ [super.setuptools];
+        });
+        inherit (pkgs.python3Packages) python-unshare;
+      });
 
-    # _.tomli.buildInputs.add = with pkgs."python3Packages"; [ flit-core ];
-  };
+      postInstall = ''
+        wrapProgram $out/bin/copy_borg \
+          --prefix PATH : ${makeBinPath (with pkgs; [util-linux borgbackup])}:${config.security.wrapperDir}
+      '';
+    };
 
   copyService = name: opts: nameValuePair "copy-borg@${utils.escapeSystemdPath name}" {
     serviceConfig = {