mirror of
https://github.com/typeable/nixpkgs.git
synced 2024-11-09 20:38:31 +03:00
Revert "Revert "Linux 4.8""
Now featuring @aszlig's modinst_arg_list_too_long patch.
This reverts commit 43bedb970d
.
Fixes #19213
This commit is contained in:
parent
0e540d2113
commit
e54313d183
20
pkgs/os-specific/linux/kernel/linux-4.8.nix
Normal file
20
pkgs/os-specific/linux/kernel/linux-4.8.nix
Normal file
@ -0,0 +1,20 @@
|
||||
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
|
||||
|
||||
import ./generic.nix (args // rec {
|
||||
version = "4.8";
|
||||
modDirVersion = "4.8.0";
|
||||
extraMeta.branch = "4.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
|
||||
sha256 = "3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a";
|
||||
};
|
||||
|
||||
kernelPatches = args.kernelPatches;
|
||||
|
||||
features.iwlwifi = true;
|
||||
features.efiBootStub = true;
|
||||
features.needsCifsUtils = true;
|
||||
features.canDisableNetfilterConntrackHelpers = true;
|
||||
features.netfilterRPFilter = true;
|
||||
} // (args.argsOverride or {}))
|
@ -10762,7 +10762,21 @@ in
|
||||
];
|
||||
};
|
||||
|
||||
/* See https://github.com/NixOS/nixpkgs/issues/19213 before adding Linux 4.8 */
|
||||
linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix {
|
||||
kernelPatches =
|
||||
[ kernelPatches.bridge_stp_helper
|
||||
# See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md
|
||||
# when adding a new linux version
|
||||
# !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking
|
||||
# kernelPatches.cpu-cgroup-v2."4.7"
|
||||
kernelPatches.modinst_arg_list_too_long
|
||||
]
|
||||
++ lib.optionals ((platform.kernelArch or null) == "mips")
|
||||
[ kernelPatches.mips_fpureg_emu
|
||||
kernelPatches.mips_fpu_sigill
|
||||
kernelPatches.mips_ext3_n32
|
||||
];
|
||||
};
|
||||
|
||||
linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix {
|
||||
kernelPatches = [
|
||||
@ -10921,7 +10935,7 @@ in
|
||||
linux = linuxPackages.kernel;
|
||||
|
||||
# Update this when adding the newest kernel major version!
|
||||
linuxPackages_latest = linuxPackages_4_7;
|
||||
linuxPackages_latest = linuxPackages_4_8;
|
||||
linux_latest = linuxPackages_latest.kernel;
|
||||
|
||||
# Build the kernel modules for the some of the kernels.
|
||||
@ -10934,6 +10948,7 @@ in
|
||||
linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1);
|
||||
linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4);
|
||||
linuxPackages_4_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_7 linuxPackages_4_7);
|
||||
linuxPackages_4_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_8 linuxPackages_4_8);
|
||||
# Don't forget to update linuxPackages_latest!
|
||||
|
||||
# Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds.
|
||||
|
Loading…
Reference in New Issue
Block a user