From f5f7ad98342dd1948e08291e2d78b266001beace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vili=20Sinerv=C3=A4?= Date: Thu, 24 Jul 2025 13:08:33 +0300 Subject: [PATCH] Attempt to make ZFS work with custom installer image --- hosts/x86_64-linux/installer.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/hosts/x86_64-linux/installer.nix b/hosts/x86_64-linux/installer.nix index 9cb351d..2184486 100644 --- a/hosts/x86_64-linux/installer.nix +++ b/hosts/x86_64-linux/installer.nix @@ -6,21 +6,6 @@ ... }: let - isUnstable = config.boot.zfs.package == pkgs.zfsUnstable; - zfsCompatibleKernelPackages = lib.filterAttrs ( - name: kernelPackages: - (builtins.match "linux_[0-9]+_[0-9]+" name) != null - && (builtins.tryEval kernelPackages).success - && ( - (!isUnstable && !kernelPackages.zfs.meta.broken) - || (isUnstable && !kernelPackages.zfs_unstable.meta.broken) - ) - ) pkgs.linuxKernel.packages; - latestKernelPackage = lib.last ( - lib.sort (a: b: (lib.versionOlder a.kernel.version b.kernel.version)) ( - builtins.attrValues zfsCompatibleKernelPackages - ) - ); zfs = pkgs.zfsUnstable.override { # this overrides saves 10MB samba = pkgs.coreutils; @@ -38,7 +23,6 @@ in environment.defaultPackages = lib.mkForce [ zfs ]; boot.kernelModules = [ "zfs" ]; boot.extraModulePackages = [ config.boot.kernelPackages.zfs_unstable ]; - boot.kernelPackages = lib.mkForce latestKernelPackage; custom.services.nixCacheClient.enable = true; services.qemuGuest.enable = true;