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

Merge pull request #212250 from Ma27/backport-drop-linux-6.0

Browse Source 
[22.11] linux_6_0: drop
This commit is contained in:
Maximilian Bosch
2023-01-23 12:58:38 +01:00
committed by GitHub
parent 4bdf26cfae 374036cb34
commit c670c322a1
4 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/kernel-generic.nix
View File

@@ -30,7 +30,6 @@ let
linux_5_4_hardened
linux_5_10_hardened
linux_5_15_hardened
linux_6_0_hardened
linux_6_1_hardened
linux_testing;

10
pkgs/os-specific/linux/kernel/hardened/patches.json
View File

@@ -49,16 +49,6 @@
"sha256": "1bx77x4x10v38ygfiz0dcw938ybczq7f3srg11ifzvwm243r5if5",
"version": "5.4.229"
},
"6.0": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-6.0.19-hardened1.patch",
"sha256": "11yn5mrvs170685pwa9k7asxlv64vgfqfg2b6m5yn2a11pr1rxg5",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/6.0.19-hardened1/linux-hardened-6.0.19-hardened1.patch"
},
"sha256": "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb",
"version": "6.0.19"
},
"6.1": {
"patch": {
"extra": "-hardened1",

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

@@ -817,7 +817,6 @@ mapAliases ({
linuxPackages_4_9 = linuxKernel.packages.linux_4_9;
linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
linuxPackages_5_17 = linuxKernel.packages.linux_5_17;
linuxPackages_5_18 = linuxKernel.packages.linux_5_18;
linuxPackages_5_19 = linuxKernel.packages.linux_5_19;
linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
@@ -837,7 +836,6 @@ mapAliases ({
linux_4_9 = linuxKernel.kernels.linux_4_9;
linux_5_10 = linuxKernel.kernels.linux_5_10;
linux_5_15 = linuxKernel.kernels.linux_5_15;
linux_5_17 = linuxKernel.kernels.linux_5_17;
linux_5_18 = linuxKernel.kernels.linux_5_18;
linux_5_19 = linuxKernel.kernels.linux_5_19;
linux_5_4 = linuxKernel.kernels.linux_5_4;

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

@@ -151,18 +151,11 @@ in {
];
};
linux_5_17 = throw "linux 5.17 was removed because it has reached its end of life upstream";
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 = callPackage ../os-specific/linux/kernel/linux-6.0.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_6_0 = throw "linux 6.0 was removed because it has reached its end of life upstream";
linux_6_1 = callPackage ../os-specific/linux/kernel/linux-6.1.nix {
kernelPatches = [
@@ -240,7 +233,7 @@ in {
linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { };
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
linux_6_0_hardened = hardenedKernelFor kernels.linux_6_0 { };
linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream";
linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { };
}));
@@ -523,10 +516,9 @@ in {
linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
linux_5_17 = throw "linux 5.17 was removed because it reached its end of life upstream"; # Added 2022-06-23
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 = recurseIntoAttrs (packagesFor kernels.linux_6_0);
linux_6_0 = throw "linux 6.0 was removed because it reached its end of life upstream"; # Added 2023-01-20
linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
};
@@ -567,7 +559,7 @@ in {
linux_5_15_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_15 { });
linux_5_18_hardened = throw "linux 5.18 was removed because it has reached its end of life upstream";
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
linux_6_0_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_0 { });
linux_6_0_hardened = throw "linux 6.0 was removed because it has reached its end of life upstream";
linux_6_1_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_6_1 { });
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);