mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 23:52:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

linux_6_0: drop

Browse Source 
EOLed by upstream, doesn't receive any patches anymore, so let's drop
it.

Currently depends on #211886 which bumps the latest compatible ZFS
version to 6.1.

Also, clean up some old aliases.
This commit is contained in:
Maximilian Bosch 2023-01-22 18:47:20 +01:00
parent 18fb9f9d9d
commit 48665a4150
No known key found for this signature in database
GPG Key ID: 9A6EEA275CA5BE0A
5 changed files with 4 additions and 43 deletions
Show Stats 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",

18
pkgs/os-specific/linux/kernel/linux-6.0.nix
View File

@ -1,18 +0,0 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, ... } @ args:
with lib;
buildLinux (args // rec {
version = "6.0.19";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = versions.pad 3 version;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";
sha256 = "01q2sciv3l9brnsfcv9knx1ps3hq9rk1a08iqk3vscg3waq7xqxb";
};
} // (args.argsOverride or { }))

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

@ -840,7 +840,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;
@ -861,7 +860,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

@ -159,18 +159,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 = [
@ -248,7 +241,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 { };
}));
@ -532,10 +525,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);
};
@ -577,7 +569,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);