nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 02:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[25.05] linux: remove 6.16, update rt (#455233)

Browse Source
This commit is contained in:
Alyssa Ross
2025-10-25 10:02:36 +00:00
committed by GitHub
parent 5a79545d3b 01275b3085
commit ad442f8f81
6 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/os-specific/linux/kernel/kernels-org.json
View File

@@ -34,11 +34,6 @@
"hash": "sha256:17zv8ail05wnbfl9yhgs4llapyk3f6qjjbfqbwx0clx61138z3rj",
"lts": true
},
"6.16": {
"version": "6.16.12",
"hash": "sha256:0vm257d76hmimnac8hzg66gd1mdg330sai39lywfn4m9bjydx93w",
"lts": false
},
"6.17": {
"version": "6.17.5",
"hash": "sha256:1kibm4b3dvncw8dzxllxiza0923q6f2xlsng4gkln5n2x4vaypy0",

6
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
View File

@@ -10,7 +10,7 @@
}@args:
let
version = "5.10.240-rt134"; # updated by ./update-rt.sh
version = "5.10.245-rt139"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in
@@ -25,7 +25,7 @@ buildLinux (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "04sdcf4aqsqchii38anzmk9f9x65wv8q1x3m9dandmi6fabw724d";
sha256 = "17wxs8i8vd5ivv99ra0sri3wmkw5c22wsaw8nf1xcvys2kmpa7hk";
};
kernelPatches =
@@ -34,7 +34,7 @@ buildLinux (
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0f2wq6w0707qn798a9lk7r31mfmdll6xwnxq8fy86574gl08ah79";
sha256 = "1nqdshpcf775cmb1kqcq939b7qx6wsy91pf0l0vsd3rdpixidzyk";
};
};
in

6
pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
View File

@@ -10,7 +10,7 @@
}@args:
let
version = "5.15.189-rt87"; # updated by ./update-rt.sh
version = "5.15.195-rt90"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in
@@ -29,7 +29,7 @@ buildLinux (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
sha256 = "1hshd26ahn6dbw6jnqi0v5afpk672w7p09mk7iri93i7hxdh5l73";
sha256 = "0hd4p76qv29zlr0iik4j9y9qynyqisk6bgfiqcwkk7gr6bf81l13";
};
kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "151vznvdcdmjsjsz3b4hfxw1v2jyigrh34k2qyxk3fkqg999fx9w";
sha256 = "15n1l3b0yq7hl2zady3s3a3zym82clyycvf5icavvd68758sdp25";
};
};
in

6
pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
View File

@@ -10,7 +10,7 @@
}@args:
let
version = "6.1.146-rt53"; # updated by ./update-rt.sh
version = "6.1.156-rt56"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in
@@ -29,7 +29,7 @@ buildLinux (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "117gyi8zym09z2qarnv02i7v23v8596nqvllid07aydlcpihl9pv";
sha256 = "13i2l04pmba7dksz2p5kwxgr5bydc5lp7284d4wfsnjf425i9fyl";
};
kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "1kz416nc8hd2pi87l9k496r2lig07dbapyh701lq81rilbzx9nmc";
sha256 = "1smah5wa4lrgb13li025lpj80yxay4g13m7c4i09whxcgxhc294k";
};
};
in

6
pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
View File

@@ -10,7 +10,7 @@
}@args:
let
version = "6.6.101-rt59"; # updated by ./update-rt.sh
version = "6.6.112-rt63"; # updated by ./update-rt.sh
branch = lib.versions.majorMinor version;
kversion = builtins.elemAt (lib.splitString "-" version) 0;
in
@@ -29,7 +29,7 @@ buildLinux (
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
sha256 = "1h71zbqlsxcafrk218s0rip9rdrj0fzqvsl81ndqnlrnjy3g4kwc";
sha256 = "08la2f8w5w2x0l9nmvzsmbwa951xyshhvdhwwhfyjmka66zr4zbc";
};
kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
name = "rt";
patch = fetchurl {
url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
sha256 = "0w71nl8s0npcz6x3qavl5j3vcqwd5wcqx4dj5ck2qs7bzv9kbrwb";
sha256 = "01z2dwl54hfqfyc8xmlz6kaw522s55jsdrdw31pjnzkn6rxf7zbf";
};
};
in

11
pkgs/top-level/linux-kernels.nix
View File

@@ -211,14 +211,6 @@ in
];
};
linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.16";
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_6_17 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.17";
kernelPatches = [
@@ -320,6 +312,7 @@ in
linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream";
linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream";
linux_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream";
linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream";
linux_4_19_hardened = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
linux_6_9_hardened = throw "linux 6.9 was removed because it has reached its end of life upstream";
@@ -752,7 +745,6 @@ in
linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16);
linux_6_17 = recurseIntoAttrs (packagesFor kernels.linux_6_17);
}
// lib.optionalAttrs config.allowAliases {
@@ -763,6 +755,7 @@ in
linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22
linux_6_14 = throw "linux 6.14 was removed because it reached its end of life upstream"; # Added 2025-06-22
linux_6_15 = throw "linux 6.15 was removed because it reached its end of life upstream"; # Added 2025-08-23
linux_6_16 = throw "linux 6.16 was removed because it reached its end of life upstream"; # Added 2025-10-22
};
rtPackages = {