mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge pull request #94699 from Mic92/linux-downgrade
Revert "linux: Init 5.8"
This commit is contained in:
commit
d7d668cc23
2 changed files with 1 additions and 28 deletions
|
@ -1,18 +0,0 @@
|
|||
{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
buildLinux (args // rec {
|
||||
version = "5.8";
|
||||
|
||||
# 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 = "1xgibkwb1yfl6qdlbxyagai0qc1pk5ark7giz1512hh6ma353xz7";
|
||||
};
|
||||
} // (args.argsOverride or {}))
|
|
@ -17296,14 +17296,6 @@ in
|
|||
];
|
||||
};
|
||||
|
||||
linux_5_8 = callPackage ../os-specific/linux/kernel/linux-5.8.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
kernelPatches.request_key_helper
|
||||
kernelPatches.export_kernel_fpu_functions."5.3"
|
||||
];
|
||||
};
|
||||
|
||||
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
|
||||
kernelPatches = [
|
||||
kernelPatches.bridge_stp_helper
|
||||
|
@ -17519,7 +17511,7 @@ in
|
|||
|
||||
# Update this when adding the newest kernel major version!
|
||||
# And update linux_latest_for_hardened below if the patches are already available
|
||||
linuxPackages_latest = linuxPackages_5_8;
|
||||
linuxPackages_latest = linuxPackages_5_7;
|
||||
linux_latest = linuxPackages_latest.kernel;
|
||||
|
||||
# Build the kernel modules for the some of the kernels.
|
||||
|
@ -17534,7 +17526,6 @@ in
|
|||
linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19);
|
||||
linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4);
|
||||
linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7);
|
||||
linuxPackages_5_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_8);
|
||||
|
||||
# When adding to this list:
|
||||
# - Update linuxPackages_latest to the latest version
|
||||
|
|
Loading…
Reference in a new issue