diff options
author | Shea Levy <shea@shealevy.com> | 2016-05-16 11:56:39 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2016-05-16 11:56:39 -0400 |
commit | 0373eb86f17cada1454d698a750345f7b6c522e9 (patch) | |
tree | 0a35d017e7a62987f2a0ed963eb4c7266ec49701 /pkgs | |
parent | a5fa7c25cbf34c6b389c4593330d842502c4c0b0 (diff) | |
download | nixpkgs-0373eb86f17cada1454d698a750345f7b6c522e9.tar nixpkgs-0373eb86f17cada1454d698a750345f7b6c522e9.tar.gz nixpkgs-0373eb86f17cada1454d698a750345f7b6c522e9.tar.bz2 nixpkgs-0373eb86f17cada1454d698a750345f7b6c522e9.tar.lz nixpkgs-0373eb86f17cada1454d698a750345f7b6c522e9.tar.xz nixpkgs-0373eb86f17cada1454d698a750345f7b6c522e9.tar.zst nixpkgs-0373eb86f17cada1454d698a750345f7b6c522e9.zip |
Linux 4.6
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.6.nix | 20 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
2 files changed, 32 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.6.nix b/pkgs/os-specific/linux/kernel/linux-4.6.nix new file mode 100644 index 00000000000..4527c8a56fd --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.6.nix @@ -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 {})) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8493da3069b..351b3a781d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |