public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #134298: linux_5_12: remove (into release-21.05)

Browse Source
This commit is contained in:
Vladimír Čunát
2021-08-18 09:26:59 +02:00
parent 4050fb937f aa1af91878
commit 7bbca9877c
4 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+1 -9
View File
@@ -20436,13 +20436,6 @@ in
];
};
linux_5_12 = callPackage ../os-specific/linux/kernel/linux-5.12.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
linux_5_13 = callPackage ../os-specific/linux/kernel/linux-5.13.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
@@ -20756,7 +20749,6 @@ in
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10);
linuxPackages_5_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_12);
linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13);
# When adding to the list above:
@@ -20790,7 +20782,7 @@ in
# Hardened Linux
hardenedLinuxPackagesFor = kernel': overrides:
let # Note: We use this hack since the hardened patches can lag behind and we don't want to delay updates:
linux_latest_for_hardened = pkgs.linux_5_12;
linux_latest_for_hardened = pkgs.linux_5_10;
kernel = (if kernel' == pkgs.linux_latest then linux_latest_for_hardened else kernel').override overrides;
in linuxPackagesFor (kernel.override {
structuredExtraConfig = import ../os-specific/linux/kernel/hardened/config.nix {