Skip to content

Commit

Permalink
linux: Add 4.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
wkennington committed Aug 31, 2015
1 parent 556eb9b commit 8e26a55
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
18 changes: 18 additions & 0 deletions pkgs/os-specific/linux/kernel/linux-4.2.nix
@@ -0,0 +1,18 @@
{ stdenv, fetchurl, ... } @ args:

import ./generic.nix (args // rec {
version = "4.2";
modDirVersion = "4.2.0";
extraMeta.branch = "4.2";

src = fetchurl {
url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
sha256 = "1syv8n5hwzdbx69rsj4vayyzskfq1w5laalg5jjd523my52f086g";
};

features.iwlwifi = true;
features.efiBootStub = true;
features.needsCifsUtils = true;
features.canDisableNetfilterConntrackHelpers = true;
features.netfilterRPFilter = true;
} // (args.argsOverride or {}))
13 changes: 12 additions & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -9782,6 +9782,16 @@ let
];
};

linux_4_2 = makeOverridable (import ../os-specific/linux/kernel/linux-4.2.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 ]
Expand Down Expand Up @@ -9947,7 +9957,7 @@ let
linux = linuxPackages.kernel;

# Update this when adding the newest kernel major version!
linuxPackages_latest = pkgs.linuxPackages_4_1;
linuxPackages_latest = pkgs.linuxPackages_4_2;
linux_latest = linuxPackages_latest.kernel;

# Build the kernel modules for the some of the kernels.
Expand All @@ -9959,6 +9969,7 @@ let
linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18);
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_4_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_2 linuxPackages_4_2);
linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
linuxPackages_custom = {version, src, configfile}:
let linuxPackages_self = (linuxPackagesFor (pkgs.linuxManualConfig {inherit version src configfile;
Expand Down

2 comments on commit 8e26a55

@edolstra
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broke iso_minimal_new_kernel: http://hydra.nixos.org/build/25314303

@wkennington
Copy link
Contributor Author

@wkennington wkennington commented on 8e26a55 Sep 1, 2015 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.