From ac93e9f2c8bbdee7b3c88d8eb358fe4f81fb578a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 24 Jul 2016 18:30:08 -0400 Subject: [PATCH] Linux 4.7 --- pkgs/os-specific/linux/kernel/linux-4.7.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 14 +++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-4.7.nix diff --git a/pkgs/os-specific/linux/kernel/linux-4.7.nix b/pkgs/os-specific/linux/kernel/linux-4.7.nix new file mode 100644 index 00000000000..53fa5de5bb6 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.7.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.7"; + modDirVersion = "4.7.0"; + extraMeta.branch = "4.7"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10"; + }; + + 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 b91e609b58c..db41ad4e8ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11104,6 +11104,17 @@ in ]; }; + linux_4_7 = callPackage ../os-specific/linux/kernel/linux-4.7.nix { + kernelPatches = + [ kernelPatches.bridge_stp_helper + ] + ++ 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") @@ -11260,7 +11271,7 @@ in linux = self.linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = self.linuxPackages_4_6; + linuxPackages_latest = self.linuxPackages_4_7; linux_latest = self.linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -11275,6 +11286,7 @@ in 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); + linuxPackages_4_7 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_7 linuxPackages_4_7); # Don't forget to update linuxPackages_latest! linuxPackages_testing = recurseIntoAttrs (self.linuxPackagesFor self.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: