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

Merge pull request #199754 from Ma27/backport-5.19-removal

Browse Source 
[22.05] linuxKernel.kernels.linux_5_19: drop
This commit is contained in:
Maximilian Bosch
2022-11-08 16:39:28 +01:00
committed by GitHub
parent 67bcb74195 c15fe8cb3b
commit df2bcbbd1c
5 changed files with 9 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ let
linux_5_4_hardened
linux_5_10_hardened
linux_5_15_hardened
linux_5_19_hardened
linux_6_0_hardened
linux_testing;
};

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

@@ -39,16 +39,6 @@
"sha256": "1yg9myqcv4kn2p7c9ap0z6xxh2qjsab2nbxf5z388skr6cgq8bql",
"version": "5.15.77"
},
"5.19": {
"patch": {
"extra": "-hardened1",
"name": "linux-hardened-5.19.17-hardened1.patch",
"sha256": "0fs9zdwxbcc3fi4w1qylvvv387ih3g0dnagw5pvq3r2k2g5fflya",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.19.17-hardened1/linux-hardened-5.19.17-hardened1.patch"
},
"sha256": "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9",
"version": "5.19.17"
},
"5.4": {
"patch": {
"extra": "-hardened1",

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

@@ -1,18 +0,0 @@
{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args:
with lib;
buildLinux (args // rec {
version = "5.19.17";
# modDirVersion needs to be x.y.z, will automatically add .0 if needed
modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
# branchVersion needs to be x.y
extraMeta.branch = versions.majorMinor version;
src = fetchurl {
url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
sha256 = "12cly10lad12idjwlgh2g0pp4hhj57h2qi4fy6jg1lbsm62b6fy9";
};
} // (args.argsOverride or { }))

6
pkgs/os-specific/linux/zfs/default.nix
View File

@@ -16,7 +16,7 @@
, enablePython ? true
# for determining the latest compatible linuxPackages
, linuxPackages_5_19 ? pkgs.linuxKernel.packages.linux_5_19
, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
}:
let
@@ -217,7 +217,7 @@ in {
zfsStable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelOlder "5.20";
latestCompatibleLinuxPackages = linuxPackages_5_19;
latestCompatibleLinuxPackages = linuxPackages_5_15;
# this package should point to the latest release.
version = "2.1.6";
@@ -228,7 +228,7 @@ in {
zfsUnstable = common {
# check the release notes for compatible kernels
kernelCompatible = kernel.kernelOlder "5.20";
latestCompatibleLinuxPackages = linuxPackages_5_19;
latestCompatibleLinuxPackages = linuxPackages_5_15;
# this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the

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

@@ -166,12 +166,7 @@ in {
linux_5_18 = throw "linux 5.18 was removed because it has reached its end of life upstream";
linux_5_19 = callPackage ../os-specific/linux/kernel/linux-5.19.nix {
kernelPatches = [
kernelPatches.bridge_stp_helper
kernelPatches.request_key_helper
];
};
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 = [
@@ -193,7 +188,7 @@ in {
else testing;
linux_testing_bcachefs = callPackage ../os-specific/linux/kernel/linux-testing-bcachefs.nix rec {
kernel = linux_5_19;
kernel = linux_6_0;
kernelPatches = kernel.kernelPatches;
};
@@ -247,7 +242,7 @@ in {
linux_5_10_hardened = hardenedKernelFor kernels.linux_5_10 { };
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 = hardenedKernelFor kernels.linux_5_19 { };
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
}));
/* Linux kernel modules are inherently tied to a specific kernel. So
@@ -514,7 +509,7 @@ in {
linux_5_16 = throw "linux 5.16 was removed because it reached its end of life upstream"; # Added 2022-04-23
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 = recurseIntoAttrs (packagesFor kernels.linux_5_19);
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);
};
@@ -555,7 +550,7 @@ in {
linux_5_10_hardened = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_10 { });
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 = recurseIntoAttrs (hardenedPackagesFor kernels.linux_5_19 { });
linux_5_19_hardened = throw "linux 5.19 was removed because it has reached its end of life upstream";
linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen);
linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx);