chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

linux_6_{13,14}{,_hardened}: remove

Browse Source 
Both are EOL.

(cherry picked from commit 23b573705d)
This commit is contained in:
Alyssa Ross
2025-06-22 12:22:28 +02:00
committed by Maximilian Bosch
parent 98f749add2
commit 6bb0e05e12
4 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,14 +27,6 @@
"version": "6.12.39",
"hash": "sha256:0iakbyipani7rcm37xb0bsl5zn7h1m7vfhwfangn64gxm012amkf"
},
"6.13": {
"version": "6.13.12",
"hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1"
},
"6.14": {
"version": "6.14.11",
"hash": "sha256:06rvydmc2yfspidnsay5hin3i8p4fxy3bvzwnry7gjf9dl5cs71z"
},
"6.15": {
"version": "6.15.7",
"hash": "sha256:1sgq32ivnrvlqskmz6i5k9157y6c5x3r9lj3pl0i23habc8ds1rm"

4
pkgs/top-level/aliases.nix
View File

@@ -1112,6 +1112,10 @@ mapAliases {
linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened;
# Added 2021-08-16
linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened;
linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened;
linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened;
linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened;
linuxPackages_latest_hardened = throw ''
The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches
frequently lag behind the upstream kernel. In some cases this meant that this attribute

4
pkgs/top-level/all-packages.nix
View File

@@ -11271,10 +11271,6 @@ with pkgs;
linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened;
linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened;
linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened;
linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened;
linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened;
linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened;
linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened;
# GNU Linux-libre kernels
linuxPackages-libre = linuxKernel.packages.linux_libre;

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

@@ -211,22 +211,6 @@ in
];
};
linux_6_13 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.13";
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_6_14 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.14";
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_6_15 = callPackage ../os-specific/linux/kernel/mainline.nix {
branch = "6.15";
kernelPatches = [
@@ -318,8 +302,6 @@ in
linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
linux_6_6_hardened = hardenedKernelFor kernels.linux_6_6 { };
linux_6_12_hardened = hardenedKernelFor kernels.linux_6_12 { };
linux_6_13_hardened = hardenedKernelFor kernels.linux_6_13 { };
linux_6_14_hardened = hardenedKernelFor kernels.linux_6_14 { };
}
// lib.optionalAttrs config.allowAliases {
@@ -327,11 +309,15 @@ in
linux_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream";
linux_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream";
linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream";
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_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";
linux_6_10_hardened = throw "linux 6.10 was removed because it has reached its end of life upstream";
linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream";
linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream";
linux_ham = kernels.linux_latest;
}
@@ -743,8 +729,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_13 = recurseIntoAttrs (packagesFor kernels.linux_6_13);
linux_6_14 = recurseIntoAttrs (packagesFor kernels.linux_6_14);
linux_6_15 = recurseIntoAttrs (packagesFor kernels.linux_6_15);
}
// lib.optionalAttrs config.allowAliases {
@@ -752,6 +736,8 @@ in
linux_6_9 = throw "linux 6.9 was removed because it reached its end of life upstream"; # Added 2024-08-02
linux_6_10 = throw "linux 6.10 was removed because it reached its end of life upstream"; # Added 2024-10-23
linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23
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
};
rtPackages = {
@@ -787,8 +773,6 @@ in
linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened);
linux_6_6_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_6_hardened);
linux_6_12_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_12_hardened);
linux_6_13_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_13_hardened);
linux_6_14_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_14_hardened);
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);
@@ -807,6 +791,8 @@ in
linux_6_10_hardened = throw "linux 6.10 was removed because it has reached its end of life upstream";
linux_6_11_hardened = throw "linux 6.11 was removed because it has reached its end of life upstream";
linux_ham = recurseIntoAttrs (packagesFor kernels.linux_latest);
linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream";
linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream";
}
);