diff options
author | Louis Taylor <louis@kragniz.eu> | 2016-03-14 06:17:51 +0000 |
---|---|---|
committer | Louis Taylor <louis@kragniz.eu> | 2016-03-14 22:34:05 +0000 |
commit | 8bdee80d3927e32bb39630c3993fcf8fd61af950 (patch) | |
tree | d03bd4c4d28793a3ead79617e08b7c2bf7c6725a | |
parent | 81fe3eb13f3457d1db41ef5ff6adfb0e7ff648af (diff) | |
download | nixlib-8bdee80d3927e32bb39630c3993fcf8fd61af950.tar nixlib-8bdee80d3927e32bb39630c3993fcf8fd61af950.tar.gz nixlib-8bdee80d3927e32bb39630c3993fcf8fd61af950.tar.bz2 nixlib-8bdee80d3927e32bb39630c3993fcf8fd61af950.tar.lz nixlib-8bdee80d3927e32bb39630c3993fcf8fd61af950.tar.xz nixlib-8bdee80d3927e32bb39630c3993fcf8fd61af950.tar.zst nixlib-8bdee80d3927e32bb39630c3993fcf8fd61af950.zip |
linux: add 4.5
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.5.nix | 20 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
2 files changed, 31 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.5.nix b/pkgs/os-specific/linux/kernel/linux-4.5.nix new file mode 100644 index 000000000000..790175d6e887 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.5.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.5"; + modDirVersion = "4.5.0"; + extraMeta.branch = "4.5"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "172i3arrc34mb7nxw31iqrmbwrdnp8dmrbf8p3b3f6z006sfy3d4"; + }; + + 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 c8bbccaf53cb..82dc112866d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10274,6 +10274,15 @@ let ]; }; + linux_4_5 = callPackage ../os-specific/linux/kernel/linux-4.5.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") @@ -10453,7 +10462,7 @@ let linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = pkgs.linuxPackages_4_4; + linuxPackages_latest = pkgs.linuxPackages_4_5; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -10467,6 +10476,7 @@ let linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); linuxPackages_4_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_3 linuxPackages_4_3); linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4); + linuxPackages_4_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_5 linuxPackages_4_5); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; |