From 7545f7618d2e0f6aea9388768069f772c990b7f8 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Fri, 9 Jan 2026 22:53:38 +0000 Subject: [PATCH] treewide: use configured zfs package --- modules/nixos/impermanence.nix | 4 ++-- modules/nixos/podman.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/nixos/impermanence.nix b/modules/nixos/impermanence.nix index 414a527..beb5512 100644 --- a/modules/nixos/impermanence.nix +++ b/modules/nixos/impermanence.nix @@ -1,6 +1,5 @@ { config, - pkgs, lib, ... }: @@ -9,6 +8,7 @@ let mkIf optionals ; + zfsPkg = config.boot.zfs.package; in { boot.zfs.forceImportRoot = false; @@ -24,7 +24,7 @@ in unitConfig.DefaultDependencies = "no"; serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.zfs}/bin/zfs rollback -r rpool/local/root@blank"; + ExecStart = "${zfsPkg}/bin/zfs rollback -r rpool/local/root@blank"; }; }; diff --git a/modules/nixos/podman.nix b/modules/nixos/podman.nix index ff1a7a1..1212950 100644 --- a/modules/nixos/podman.nix +++ b/modules/nixos/podman.nix @@ -1,5 +1,4 @@ { - pkgs, lib, config, ... @@ -9,6 +8,7 @@ with lib; let cfg = config.modules.podman; + zfsPkg = config.boot.zfs.package; in { options.modules.podman = { @@ -29,7 +29,7 @@ in dates = "weekly"; flags = [ "--all" ]; }; - extraPackages = [ pkgs.zfs ]; + extraPackages = [ zfsPkg ]; }; containers.storage.settings.storage = {