From 077b2d2621977d99b10abd57036f9a3895cb407f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 16 Aug 2024 10:34:39 +0200
Subject: [PATCH] switch to zfsUnstable

---
 nix/installer.nix   |  6 ++----
 nix/zfs-minimal.nix | 17 ++---------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/nix/installer.nix b/nix/installer.nix
index 36f490f..29e9507 100644
--- a/nix/installer.nix
+++ b/nix/installer.nix
@@ -12,10 +12,8 @@
   system.stateVersion = config.system.nixos.version;
 
   # use latest kernel we can support to get more hardware support
-  boot.kernelPackages =
-    lib.mkDefault
-      (pkgs.zfs.override { removeLinuxDRM = pkgs.hostPlatform.isAarch64; }).latestCompatibleLinuxPackages;
-  boot.zfs.removeLinuxDRM = lib.mkDefault pkgs.hostPlatform.isAarch64;
+  boot.zfs.package = pkgs.zfsUnstable;
+  boot.kernelPackages = lib.mkDefault pkgs.zfsUnstable.latestCompatibleLinuxPackages;
 
   documentation.enable = false;
   documentation.man.man-db.enable = false;
diff --git a/nix/zfs-minimal.nix b/nix/zfs-minimal.nix
index 5674dc1..62a587f 100644
--- a/nix/zfs-minimal.nix
+++ b/nix/zfs-minimal.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 # incorperate a space-optimized version of zfs
 let
-  zfs = pkgs.zfs.override {
+  zfs = pkgs.zfsUnstable.override {
     # this overrides saves 10MB
     samba = pkgs.coreutils;
   };
@@ -13,20 +13,7 @@ in
   environment.defaultPackages = lib.mkForce [ zfs ]; # this merges with outer noninteractive module.
 
   boot.kernelModules = [ "zfs" ];
-  boot.extraModulePackages = [
-    (config.boot.kernelPackages.zfs.override {
-      inherit (config.boot.zfs) removeLinuxDRM;
-    })
-  ];
-
-  boot.kernelPatches = lib.optional (config.boot.zfs.removeLinuxDRM && pkgs.stdenv.hostPlatform.system == "aarch64-linux") {
-    name = "export-neon-symbols-as-gpl";
-    patch = pkgs.fetchpatch {
-      url = "https://github.com/torvalds/linux/commit/aaeca98456431a8d9382ecf48ac4843e252c07b3.patch";
-      hash = "sha256-L2g4G1tlWPIi/QRckMuHDcdWBcKpObSWSRTvbHRIwIk=";
-      revert = true;
-    };
-  };
+  boot.extraModulePackages = [ config.boot.kernelPackages.zfs_unstable ];
 
   networking.hostId = lib.mkDefault "8425e349";
 }