From 101d8b7ba8026d77d24c66ef9e8fa4c98e79ee67 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Fri, 26 May 2023 09:59:54 +0000
Subject: [PATCH] linux_6_2: drop

EOL
---
 pkgs/os-specific/linux/kernel/linux-6.2.nix | 18 ------------------
 pkgs/os-specific/linux/zfs/stable.nix       |  5 +----
 pkgs/os-specific/linux/zfs/unstable.nix     |  5 +----
 pkgs/top-level/linux-kernels.nix            | 12 ++----------
 4 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-6.2.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-6.2.nix b/pkgs/os-specific/linux/kernel/linux-6.2.nix
deleted file mode 100644
index c9429bfde1f..00000000000
--- a/pkgs/os-specific/linux/kernel/linux-6.2.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
-
-with lib;
-
-buildLinux (args // rec {
-  version = "6.2.16";
-
-  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
-  modDirVersion = versions.pad 3 version;
-
-  # branchVersion needs to be x.y
-  extraMeta.branch = versions.majorMinor version;
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
-    sha256 = "04w76lfkfiq7z4dl3cnq6yiqmiwjayhw3n7n81hv8d3919w0vzq6";
-  };
-} // (args.argsOverride or { }))
diff --git a/pkgs/os-specific/linux/zfs/stable.nix b/pkgs/os-specific/linux/zfs/stable.nix
index 25fa96b9b6e..9a46e3d66b7 100644
--- a/pkgs/os-specific/linux/zfs/stable.nix
+++ b/pkgs/os-specific/linux/zfs/stable.nix
@@ -14,10 +14,7 @@ callPackage ./generic.nix args {
     if stdenv'.isx86_64
     then kernel.kernelOlder "6.3"
     else kernel.kernelOlder "6.2";
-  latestCompatibleLinuxPackages =
-    if stdenv'.isx86_64
-    then linuxKernel.packages.linux_6_2
-    else linuxKernel.packages.linux_6_1;
+  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;
 
   # this package should point to the latest release.
   version = "2.1.11";
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 3953b5ed8d9..b8cf789e8ff 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -16,10 +16,7 @@ callPackage ./generic.nix args {
   kernelCompatible = if stdenv'.isx86_64
     then kernel.kernelOlder "6.3"
     else kernel.kernelOlder "6.2";
-  latestCompatibleLinuxPackages =
-    if stdenv'.isx86_64
-    then linuxKernel.packages.linux_6_2
-    else linuxKernel.packages.linux_6_1;
+  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;
 
   # this package should point to a version / git revision compatible with the latest kernel release
   # IMPORTANT: Always use a tagged release candidate or commits from the
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index f12228b2933..a602c2447fb 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -183,15 +183,6 @@ in {
       ];
     };
 
-    linux_6_2 = callPackage ../os-specific/linux/kernel/linux-6.2.nix {
-      kernelPatches = [
-        kernelPatches.bridge_stp_helper
-        kernelPatches.request_key_helper
-        kernelPatches.make-maple-state-reusable-after-mas_empty_area
-        kernelPatches.fix-em-ice-bonding
-      ];
-    };
-
     linux_6_3 = callPackage ../os-specific/linux/kernel/linux-6.3.nix {
       kernelPatches = [
         kernelPatches.bridge_stp_helper
@@ -282,6 +273,7 @@ in {
     linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";
     linux_5_19 = throw "linux 5.19 was removed because it has reached its end of life upstream";
     linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream";
+    linux_6_2 = throw "linux 6.2 was removed because it has reached its end of life upstream";
 
     linux_xanmod_tt = throw "linux_xanmod_tt was removed because upstream no longer offers this option";
 
@@ -581,13 +573,13 @@ in {
     linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
     linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
     linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
-    linux_6_2 = recurseIntoAttrs (packagesFor kernels.linux_6_2);
     linux_6_3 = recurseIntoAttrs (packagesFor kernels.linux_6_3);
   } // lib.optionalAttrs config.allowAliases {
     linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; # Added 2022-11-08
     linux_5_18 = throw "linux 5.18 was removed because it reached its end of life upstream"; # Added 2022-09-17
     linux_5_19 = throw "linux 5.19 was removed because it reached its end of life upstream"; # Added 2022-11-01
     linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20
+    linux_6_2 = throw "linux 6.2 was removed because it reached its end of life upstream"; # Added 2023-05-26
   };
 
   rtPackages = {