diff options
author | Shea Levy <shea@shealevy.com> | 2016-01-12 19:39:00 -0500 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2016-01-12 19:39:00 -0500 |
commit | 44274f62f59a7f0b7460b098c1eb50b54f449565 (patch) | |
tree | a482b376cbcd14e5f91add56ce5b7dde3a57f948 /pkgs | |
parent | 0d79a33fb69d37868f42a594855a26734859ec1c (diff) | |
download | nixlib-44274f62f59a7f0b7460b098c1eb50b54f449565.tar nixlib-44274f62f59a7f0b7460b098c1eb50b54f449565.tar.gz nixlib-44274f62f59a7f0b7460b098c1eb50b54f449565.tar.bz2 nixlib-44274f62f59a7f0b7460b098c1eb50b54f449565.tar.lz nixlib-44274f62f59a7f0b7460b098c1eb50b54f449565.tar.xz nixlib-44274f62f59a7f0b7460b098c1eb50b54f449565.tar.zst nixlib-44274f62f59a7f0b7460b098c1eb50b54f449565.zip |
linux: Add 4.4
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/kernel/linux-4.4.nix | 18 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
2 files changed, 29 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix new file mode 100644 index 000000000000..36a297b95e57 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl, perl, buildLinux, ... } @ args: + +import ./generic.nix (args // rec { + version = "4.4"; + modDirVersion = "4.4.0"; + extraMeta.branch = "4.4"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; + sha256 = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2"; + }; + + 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 73a4c899823b..ab32b1b2f385 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10030,6 +10030,15 @@ let ]; }; + linux_4_4 = callPackage ../os-specific/linux/kernel/linux-4.4.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") @@ -10190,7 +10199,7 @@ let linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = pkgs.linuxPackages_4_3; + linuxPackages_latest = pkgs.linuxPackages_4_4; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -10203,6 +10212,7 @@ let linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1); linuxPackages_4_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_2 linuxPackages_4_2); 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_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); linuxPackages_custom = {version, src, configfile}: let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile; |