Linux 4.6

This commit is contained in:
Shea Levy 2016-05-16 11:56:39 -04:00
parent a5fa7c25cb
commit 0373eb86f1
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,20 @@
{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
import ./generic.nix (args // rec {
version = "4.6";
modDirVersion = "4.6.0";
extraMeta.branch = "4.5";
src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "a93771cd5a8ad27798f22e9240538dfea48d3a2bf2a6a6ab415de3f02d25d866";
};
kernelPatches = args.kernelPatches;
features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))

View File

@ -10695,6 +10695,15 @@ in
];
};
linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix {
kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.qat_common_Makefile ]
++ 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 = [ kernelPatches.bridge_stp_helper ]
++ lib.optionals ((platform.kernelArch or null) == "mips")
@ -10870,7 +10879,7 @@ in
linux = self.linuxPackages.kernel;
# Update this when adding the newest kernel major version!
linuxPackages_latest = self.linuxPackages_4_5;
linuxPackages_latest = self.linuxPackages_4_6;
linux_latest = self.linuxPackages_latest.kernel;
# Build the kernel modules for the some of the kernels.
@ -10885,6 +10894,8 @@ in
linuxPackages_4_3 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_3 linuxPackages_4_3);
linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4);
linuxPackages_4_5 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_5 linuxPackages_4_5);
linuxPackages_4_6 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_6 linuxPackages_4_6);
# Don't forget to update linuxPackages_latest!
linuxPackages_testing = recurseIntoAttrs (self.linuxPackagesFor self.linux_testing linuxPackages_testing);
linuxPackages_custom = {version, src, configfile}:
let linuxPackages_self = (self.linuxPackagesFor (self.linuxManualConfig {inherit version src configfile;