From 1a56781114bdd69a4e417c00595607d84c01b71e 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
---
 ci/OWNERS                          |  6 ------
 nixos/tests/zfs.nix                |  6 ------
 pkgs/os-specific/linux/zfs/2_1.nix | 30 ------------------------------
 pkgs/top-level/all-packages.nix    |  4 ----
 pkgs/top-level/linux-kernels.nix   |  4 ----
 5 files changed, 50 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/zfs/2_1.nix

diff --git a/ci/OWNERS b/ci/OWNERS
index d67e6b019b8ccd..8953e00b9cef9a 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -385,12 +385,6 @@ pkgs/by-name/fo/forgejo/                @adamcstephens @bendlas @emilylange
 /pkgs/development/compilers/ocaml   @ulrikstrid
 /pkgs/development/ocaml-modules     @ulrikstrid
 
-# ZFS
-pkgs/os-specific/linux/zfs/2_1.nix        @raitobezarius
-pkgs/os-specific/linux/zfs/generic.nix    @raitobezarius
-nixos/modules/tasks/filesystems/zfs.nix   @raitobezarius
-nixos/tests/zfs.nix                       @raitobezarius
-
 # Zig
 /pkgs/development/compilers/zig @figsoda
 /doc/hooks/zig.section.md       @figsoda
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix
index 13db2c8e06be6e..75b41b7aac1dc5 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/os-specific/linux/zfs/2_1.nix b/pkgs/os-specific/linux/zfs/2_1.nix
deleted file mode 100644
index 885ebca73abb7c..00000000000000
--- a/pkgs/os-specific/linux/zfs/2_1.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ callPackage
-, kernel ? null
-, stdenv
-, lib
-, nixosTests
-, ...
-} @ args:
-
-let
-  stdenv' = if kernel == null then stdenv else kernel.stdenv;
-in
-callPackage ./generic.nix args {
-  # You have to ensure that in `pkgs/top-level/linux-kernels.nix`
-  # this attribute is the correct one for this package.
-  kernelModuleAttribute = "zfs_2_1";
-  # check the release notes for compatible kernels
-  kernelCompatible = kernel: kernel.kernelOlder "6.8";
-
-  # This is a fixed version to the 2.1.x series, move only
-  # if the 2.1.x series moves.
-  version = "2.1.15";
-
-  hash = "sha256-zFO8fMbirEOrn5W57rAN7IWY6EIXG8jDXqhP7BWJyiY=";
-
-  tests = {
-    inherit (nixosTests.zfs) series_2_1;
-  };
-
-  maintainers = [ lib.maintainers.raitobezarius ];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7543000e796118..c193b55ad3cb59 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 5dc2bf56e8afa2..0cb0c87adfe7d2 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;