From 2594192c4c3ca52408c53cf6a04e8188b7b955b5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 28 Jun 2026 09:20:45 +1000 Subject: [PATCH] linux_7_0: remove EOL --- pkgs/os-specific/linux/kernel/kernels-org.json | 5 ----- pkgs/top-level/linux-kernels.nix | 11 ++--------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 1850e03a312b..1de49c6be741 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -34,11 +34,6 @@ "hash": "sha256:0maj2ap1m09bxl6a3g9wc65h9sdr6y8rwc5qcqlbavb4wq0d4g58", "lts": true }, - "7.0": { - "version": "7.0.14", - "hash": "sha256:160ggaq9rh50a39gz02fpia8maq85bwxhqlwsc03yafjhjvrk6fy", - "lts": false - }, "7.1": { "version": "7.1.2", "hash": "sha256:0gw8nnq6nix9xk2dhb1jwmhnqjayrn3bn2akzg4lgqkvfa9qq69p", diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index ccd896e616ee..e6ca68d1640b 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -92,14 +92,6 @@ in ]; }; - linux_7_0 = callPackage ../os-specific/linux/kernel/mainline.nix { - branch = "7.0"; - kernelPatches = [ - kernelPatches.bridge_stp_helper - kernelPatches.request_key_helper - ]; - }; - linux_7_1 = callPackage ../os-specific/linux/kernel/mainline.nix { branch = "7.1"; kernelPatches = [ @@ -175,6 +167,7 @@ in linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream"; linux_6_17 = throw "linux 6.17 was removed because it has reached its end of life upstream"; linux_6_19 = throw "linux 6.19 was removed because it has reached its end of life upstream"; + linux_7_0 = throw "linux 7.0 was removed because it has reached its end of life upstream"; linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; @@ -674,7 +667,6 @@ in linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); linux_6_18 = recurseIntoAttrs (packagesFor kernels.linux_6_18); - linux_7_0 = recurseIntoAttrs (packagesFor kernels.linux_7_0); linux_7_1 = recurseIntoAttrs (packagesFor kernels.linux_7_1); } // lib.optionalAttrs config.allowAliases { @@ -689,6 +681,7 @@ in linux_6_16 = throw "linux 6.16 was removed because it reached its end of life upstream"; # Added 2025-10-22 linux_6_17 = throw "linux 6.17 was removed because it reached its end of life upstream"; # Added 2025-12-22 linux_6_19 = throw "linux 6.19 was removed because it reached its end of life upstream"; # Added 2026-04-23 + linux_7_0 = throw "linux 7.0 was removed because it has reached its end of life upstream"; # Added 2026-06-27 }; rpiPackages = {