From 6eb30e39533e9a6c461522388ebe8eb2daa62f6d Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Wed, 30 Oct 2024 11:21:18 -0400
Subject: [PATCH] zfs_2_1: remove

With the release of 2.3.0-rc, we know that 2.3.0 will be coming sometime
soon. Per the [ZFS release policy][1], only the current and previous
releases are expected to be supported, so 2.1.x will become unsupported.
Unfortunately upstream does not have any specific timelines, so we do
not know when it will become unsupported, but when it does we will
likely backport the removal. As such, begin warning of imminent removal.

[1]: https://github.com/openzfs/zfs/blob/6187b194349c5a728c9df8c6842f1866d5c9782a/RELEASES.md
---
 nixos/tests/zfs.nix              | 6 ------
 pkgs/top-level/all-packages.nix  | 4 ----
 pkgs/top-level/linux-kernels.nix | 4 ----
 3 files changed, 14 deletions(-)

diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index 13db2c8e06be6..75b41b7aac1dc 100644
--- a/nixos/tests/zfs.nix
+++ b/nixos/tests/zfs.nix
@@ -191,12 +191,6 @@ let
 
 in {
 
-  # maintainer: @raitobezarius
-  series_2_1 = makeZfsTest {
-    zfsPackage = pkgs.zfs_2_1;
-    kernelPackages = pkgs.linuxPackages;
-  };
-
   series_2_2 = makeZfsTest {
     zfsPackage = pkgs.zfs_2_2;
     kernelPackages = pkgs.linuxPackages;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7543000e79611..c193b55ad3cb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12924,9 +12924,6 @@ with pkgs;
 
   inherit
     ({
-      zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix {
-        configFile = "user";
-      };
       zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
         configFile = "user";
       };
@@ -12934,7 +12931,6 @@ with pkgs;
         configFile = "user";
       };
     })
-    zfs_2_1
     zfs_2_2
     zfs_unstable;
   zfs = zfs_2_2;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 5dc2bf56e8afa..0cb0c87adfe7d 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -578,10 +578,6 @@ in {
 
     zenpower = callPackage ../os-specific/linux/zenpower { };
 
-    zfs_2_1 = callPackage ../os-specific/linux/zfs/2_1.nix {
-      configFile = "kernel";
-      inherit pkgs kernel;
-    };
     zfs_2_2 = callPackage ../os-specific/linux/zfs/2_2.nix {
       configFile = "kernel";
       inherit pkgs kernel;