Compare commits

...

2 commits

Author SHA1 Message Date
Benson Chu
b6ae11d755 unstablePkgs should allow unfree 2026-04-11 19:30:54 -05:00
eb05cf68f6 Fixup bug with zfs replication 2026-04-11 19:30:54 -05:00
3 changed files with 20 additions and 1 deletions

View file

@ -16,7 +16,7 @@
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
unstablePkgs = unstable.legacyPackages.${system}; unstablePkgs = import unstable { inherit system; config.allowUnfree = true; };
updatePkgs = import update { inherit system; config.allowUnfree = true; }; updatePkgs = import update { inherit system; config.allowUnfree = true; };
in { in {
nixosConfigurations = { nixosConfigurations = {
@ -43,6 +43,7 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit unstablePkgs updatePkgs nixos-hardware; }; specialArgs = { inherit unstablePkgs updatePkgs nixos-hardware; };
modules = [ modules = [
{ nixpkgs.overlays = [ (import ./overlays/zfs-replicate.nix) ]; }
./hosts/axl/configuration.nix ./hosts/axl/configuration.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {

View file

@ -0,0 +1,11 @@
--- 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:
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]:

View file

@ -0,0 +1,7 @@
final: prev: {
zfs-replicate = prev.zfs-replicate.overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or []) ++ [
./zfs-replicate-env-fix.patch
];
});
}