From 08bde4af31ce604124aadb927add1e6df5b75868 Mon Sep 17 00:00:00 2001
From: Julien Malka <julien.malka@me.com>
Date: Fri, 1 Apr 2022 10:42:32 +0200
Subject: [PATCH] Fixed kernel version to 5.10 to avoid problems and updated
 zfs

---
 machines/lisa/hardware.nix    |  2 +-
 machines/newton/hardware.nix  |  2 +-
 modules/zfs-mails/default.nix | 11 +----------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/machines/lisa/hardware.nix b/machines/lisa/hardware.nix
index beffa57..8eaf125 100644
--- a/machines/lisa/hardware.nix
+++ b/machines/lisa/hardware.nix
@@ -1,7 +1,7 @@
 { pkgs, config, lib, ... }:
 {
   boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sd_mod" "sr_mod" ];
-  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+  boot.kernelPackages = pkgs.linuxPackages_5_10;
 
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
diff --git a/machines/newton/hardware.nix b/machines/newton/hardware.nix
index 630d69a..69f2b55 100644
--- a/machines/newton/hardware.nix
+++ b/machines/newton/hardware.nix
@@ -6,7 +6,7 @@
   boot.zfs.requestEncryptionCredentials = true;
   boot.loader.grub.copyKernels = true;
   boot.loader.grub.efiSupport = false;
-  boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+  boot.kernelPackages = pkgs.linuxPackages_5_10;
 
   boot.loader.grub.mirroredBoots = [
     { path = "/boot-1"; devices = [ "/dev/disk/by-id/ata-WDC_WD20EFRX-68EUZN0_WD-WCC4M1TVUVJV" ]; }
diff --git a/modules/zfs-mails/default.nix b/modules/zfs-mails/default.nix
index 077fa3e..bc9b498 100644
--- a/modules/zfs-mails/default.nix
+++ b/modules/zfs-mails/default.nix
@@ -15,16 +15,7 @@ let
 
 
   customizeZfs = zfs:
-    (zfs.override { enableMail = true; }).overrideAttrs (oldAttrs: {
-      patches = oldAttrs.patches ++
-        [
-          (pkgs.fetchpatch {
-            name = "notify-on-unavail-events.patch";
-            url = "https://github.com/openzfs/zfs/commit/f74604f2f0d76ee55b59f7ed332409fb128ec7e5.patch";
-            sha256 = "1v25ydkxxx704j0gdxzrxvw07gfhi7865grcm8b0zgz9kq0w8i8i";
-          })
-        ];
-    });
+    (zfs.override { enableMail = true; });
 
   hostName = cfg.name;
   sendEmailEvent = { event }: ''