From fafec15df6a416dd0ab8c88986e2f3d84ced538e Mon Sep 17 00:00:00 2001
From: Benson Chu <dev@mail.pestctrl.io>
Date: Sat, 11 Apr 2026 19:10:21 -0500
Subject: [PATCH] Fixup bug with zfs replication

---
 flake.nix                            |  1 +
 overlays/zfs-replicate-env-fix.patch | 20 ++++++++++++++++++++
 overlays/zfs-replicate.nix           |  7 +++++++
 3 files changed, 28 insertions(+)
 create mode 100644 overlays/zfs-replicate-env-fix.patch
 create mode 100644 overlays/zfs-replicate.nix

diff --git a/flake.nix b/flake.nix
index 3796fa9..4b95516 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,6 +43,7 @@
           system = "x86_64-linux";
           specialArgs = { inherit unstablePkgs updatePkgs nixos-hardware; };
           modules = [
+            { nixpkgs.overlays = [ (import ./overlays/zfs-replicate.nix) ]; }
             ./hosts/axl/configuration.nix
             home-manager.nixosModules.home-manager
             {
diff --git a/overlays/zfs-replicate-env-fix.patch b/overlays/zfs-replicate-env-fix.patch
new file mode 100644
index 0000000..0c44cbb
--- /dev/null
+++ b/overlays/zfs-replicate-env-fix.patch
@@ -0,0 +1,20 @@
+diff --git a/zfs/replicate/filesystem/list.py b/zfs/replicate/filesystem/list.py
+<<<<<<< HEAD
+index 0000000..1111111 100644
+--- a/zfs/replicate/filesystem/list.py
++++ b/zfs/replicate/filesystem/list.py
+@@ -42,7 +42,7 @@ def _list(filesystem: FileSystem) -> str:
+=======
+index 5e892e6..f33e11e 100644
+--- a/zfs/replicate/filesystem/list.py
++++ b/zfs/replicate/filesystem/list.py
+@@ -42,4 +42,4 @@ def list(  # pylint: disable=W0622
+ def _list(filesystem: FileSystem) -> str:
+>>>>>>> 773248e (Fixup bug with zfs replication)
+     options = ["-H", "-o name,readonly", "-t filesystem,volume", "-r"]
+
+-    return f"/usr/bin/env - zfs list {' '.join(options)} '{filesystem.name}'"
++    return f"/usr/bin/env zfs list {' '.join(options)} '{filesystem.name}'"
+
+
+ def _filesystems(zfs_list_output: bytes) -> List[FileSystem]:
diff --git a/overlays/zfs-replicate.nix b/overlays/zfs-replicate.nix
new file mode 100644
index 0000000..5999f53
--- /dev/null
+++ b/overlays/zfs-replicate.nix
@@ -0,0 +1,7 @@
+final: prev: {
+  zfs-replicate = prev.zfs-replicate.overrideAttrs (oldAttrs: {
+    patches = (oldAttrs.patches or []) ++ [
+      ./zfs-replicate-env-fix.patch
+    ];
+  });
+}