From 305de5b3aa88cf8e840d221805fdcf1856d18533 Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Tue, 6 May 2025 16:34:55 -0500
Subject: [PATCH] cyclone: Use upstream ZFS

This was not correctly cherry-picked to be committed previously - oops!
---
 flake.lock                                     |  6 +++---
 hosts/linux/cyclone/hardware-configuration.nix | 18 ++----------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index b8878ef..5323995 100644
--- a/flake.lock
+++ b/flake.lock
@@ -142,11 +142,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1746328495,
-        "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
+        "lastModified": 1746461020,
+        "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
+        "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
         "type": "github"
       },
       "original": {
diff --git a/hosts/linux/cyclone/hardware-configuration.nix b/hosts/linux/cyclone/hardware-configuration.nix
index 925d068..6d173fd 100644
--- a/hosts/linux/cyclone/hardware-configuration.nix
+++ b/hosts/linux/cyclone/hardware-configuration.nix
@@ -22,24 +22,10 @@
     # supports kernel 6.14 with no changes necessary.
     #
     # We'll temporarily override it to not mark it as broken.
-    kernelPackages = pkgs.linuxPackages_6_14.extend (final: prev: {
-      zfs_unstable = prev.zfs_unstable.overrideAttrs (oldAttrs: {
-        # Well.. that's partially a lie, it does need
-        # one patch to specify it's compatible.
-        patches = [
-          (pkgs.fetchpatch {
-            url = "https://patch-diff.githubusercontent.com/raw/openzfs/zfs/pull/17172.patch";
-            hash = "sha256-c8YP1a36uwYvvW+h4yT6s3PIKkHq6IMjVal2CcNI4p4=";
-          })
-        ];
-        meta.broken = false;
-      });
-    });
+    kernelPackages = pkgs.linuxPackages_6_14;
 
     zfs = {
-      package = pkgs.zfs_unstable.overrideAttrs (oldAttrs: rec {
-        meta.broken = false;
-      });
+      package = pkgs.zfs_unstable;
       # For reasons unbeknownst to humanity, this drive
       # appeared to keep changing identifiers.
       #