modules/nixos/common: switch to zfs_2_3

nix-community · Jan 15, 2025 · d133f63 · d133f63
1 parent 9f1826f
commit d133f63
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/hosts/build01/default.nix b/hosts/build01/default.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }:
+{ inputs, ... }:
 {
   imports = [
     inputs.self.nixosModules.cgroups
@@ -7,8 +7,6 @@
     inputs.srvos.nixosModules.hardware-hetzner-online-amd
   ];
 
-  boot.zfs.package = pkgs.zfs_unstable;
-
   nix.settings.max-jobs = 24;
 
   nixpkgs.hostPlatform.gcc.arch = "znver2";

diff --git a/hosts/build05/default.nix b/hosts/build05/default.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }:
+{ inputs, ... }:
 {
   imports = [
     inputs.self.nixosModules.cgroups
@@ -7,8 +7,6 @@
     inputs.srvos.nixosModules.hardware-hetzner-online-arm
   ];
 
-  boot.zfs.package = pkgs.zfs_unstable;
-
   nix.settings.max-jobs = 80;
 
   nixpkgs.hostPlatform.gcc.arch = "armv8-a";

diff --git a/modules/nixos/common/builder.nix b/modules/nixos/common/builder.nix
@@ -11,6 +11,8 @@
 
     boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_6;
 
+    boot.zfs.package = pkgs.zfs_2_3;
+
     # kernel samepage merging
     hardware.ksm.enable = true;