diff options
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.1.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
2 files changed, 30 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix new file mode 100644 index 00000000000..baee61940cd --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.1"; + modDirVersion = "4.1.0"; + extraMeta.branch = "4.1"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "17rdly75zh49m6r32yy03xappl7ajcqbznq09pm1q7mcb841zxfa"; + }; + + 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 27169e6ee0d..e35ac93700e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9588,6 +9588,16 @@ let ]; }; + linux_4_1 = makeOverridable (import ../os-specific/linux/kernel/linux-4.1.nix) { + inherit fetchurl stdenv perl buildLinux; + 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 = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = [ kernelPatches.bridge_stp_helper ] @@ -9754,7 +9764,7 @@ let linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = pkgs.linuxPackages_4_0; + linuxPackages_latest = pkgs.linuxPackages_4_1; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -9768,6 +9778,7 @@ let linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); linuxPackages_3_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_19 linuxPackages_3_19); linuxPackages_4_0 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_0 linuxPackages_4_0); + linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; |