From 4cdf75d2d0c3b3b7c877ad182a0214f8dda34917 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 1 Dec 2025 14:11:40 +0300 Subject: [PATCH 1/4] linux_6_18: init at 6.18 --- pkgs/os-specific/linux/kernel/kernels-org.json | 5 +++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 11 ++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 6ec97b58bf0d..443085c1a5bf 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -33,5 +33,10 @@ "version": "6.17.9", "hash": "sha256:01lfiw67jm853jr3wddvv0hl6lljscg2ils4ips9sl1wjlxq023d", "lts": false + }, + "6.18": { + "version": "6.18", + "hash": "sha256:0jzdvk3xdai1xsq0739hmf8rapw15dw5inarfvqizqx9bmha81li", + "lts": false } } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3bc3e1779b33..ccfac491f87b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -896,6 +896,7 @@ mapAliases { linux_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream"; # Added 2025-08-30 linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream"; # Added 2025-10-22 linux_6_17 = linuxKernel.kernels.linux_6_17; + linux_6_18 = linuxKernel.kernels.linux_6_18; linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24 linux_hardened = linuxPackages_hardened.kernel; # Added 2025-08-10 linux_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01 @@ -925,6 +926,7 @@ mapAliases { linuxPackages_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream"; # Added 2025-08-30 linuxPackages_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream"; # Added 2025-10-22 linuxPackages_6_17 = linuxKernel.packages.linux_6_17; + linuxPackages_6_18 = linuxKernel.packages.linux_6_18; linuxPackages_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24 linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10 linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01 diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 121f344a22b1..cdf6e9f9439a 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -204,6 +204,14 @@ in ]; }; + linux_6_18 = callPackage ../os-specific/linux/kernel/mainline.nix { + branch = "6.18"; + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux_testing = let testing = callPackage ../os-specific/linux/kernel/mainline.nix { @@ -721,6 +729,7 @@ in linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6); linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12); linux_6_17 = recurseIntoAttrs (packagesFor kernels.linux_6_17); + linux_6_18 = recurseIntoAttrs (packagesFor kernels.linux_6_18); } // lib.optionalAttrs config.allowAliases { linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21 @@ -795,7 +804,7 @@ in packageAliases = { linux_default = packages.linux_6_12; # Update this when adding the newest kernel major version! - linux_latest = packages.linux_6_17; + linux_latest = packages.linux_6_18; linux_rt_default = packages.linux_rt_5_15; linux_rt_latest = packages.linux_rt_6_6; } From 9947990ab5196292333f3d52ef14eee970c9c3ba Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 1 Dec 2025 14:11:43 +0300 Subject: [PATCH 2/4] linux_6_17: 6.17.9 -> 6.17.10 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 443085c1a5bf..03d5142d494b 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,8 +30,8 @@ "lts": true }, "6.17": { - "version": "6.17.9", - "hash": "sha256:01lfiw67jm853jr3wddvv0hl6lljscg2ils4ips9sl1wjlxq023d", + "version": "6.17.10", + "hash": "sha256:1kf8slgkvv9x6i1111l78p93y65rscdxarh05spx1njh797k8zzs", "lts": false }, "6.18": { From 3cd8a33e6ab860589bbd3e7a0248508aa6b4252d Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 1 Dec 2025 14:11:46 +0300 Subject: [PATCH 3/4] linux_6_12: 6.12.59 -> 6.12.60 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 03d5142d494b..e6b384d67758 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -25,8 +25,8 @@ "lts": true }, "6.12": { - "version": "6.12.59", - "hash": "sha256:1gjqr91qysbzx55ic8101l8vsfb4q09bph8m4q1fq3pi4xrwvlm1", + "version": "6.12.60", + "hash": "sha256:1y6wkk4500pisk9l2dibmidqix1gpci7dy6brs1xc4bl2jr9cc56", "lts": true }, "6.17": { From d282795039f0769ad0ebd8dca64bc0d41d9d2e18 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 1 Dec 2025 14:11:49 +0300 Subject: [PATCH 4/4] linux_6_6: 6.6.117 -> 6.6.118 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index e6b384d67758..8546fa4b3354 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "lts": true }, "6.6": { - "version": "6.6.117", - "hash": "sha256:1la3if0n4pv8lii4ggh4c69a61aga66bdl7x1jkvvz92j83k2fv4", + "version": "6.6.118", + "hash": "sha256:0zdifhri9flxa99hzrk9bz8yqi8h1v6zpsvldz9cibvlakixrpab", "lts": true }, "6.12": {