Skip to content

Commit 8bb2313

Browse files
committed
kernel: Add 3.15
1 parent e68a5b2 commit 8bb2313

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed

Diff for: pkgs/os-specific/linux/kernel/linux-3.15.nix

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{ stdenv, fetchurl, ... } @ args:
2+
3+
import ./generic.nix (args // rec {
4+
version = "3.15";
5+
extraMeta.branch = "3.15";
6+
modDirVersion = "3.15.0";
7+
8+
src = fetchurl {
9+
url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
10+
sha256 = "153pn0zjzgi3ls4gy12n900ayskpq0yncn0vra5glh20ps3px4n3";
11+
};
12+
13+
features.iwlwifi = true;
14+
features.efiBootStub = true;
15+
features.needsCifsUtils = true;
16+
features.canDisableNetfilterConntrackHelpers = true;
17+
features.netfilterRPFilter = true;
18+
} // (args.argsOverride or {}))

Diff for: pkgs/top-level/all-packages.nix

+12-2
Original file line numberDiff line numberDiff line change
@@ -7198,6 +7198,15 @@ let
71987198
];
71997199
};
72007200

7201+
linux_3_15 = makeOverridable (import ../os-specific/linux/kernel/linux-3.15.nix) {
7202+
inherit fetchurl stdenv perl buildLinux;
7203+
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
7204+
[ kernelPatches.mips_fpureg_emu
7205+
kernelPatches.mips_fpu_sigill
7206+
kernelPatches.mips_ext3_n32
7207+
];
7208+
};
7209+
72017210
linux_testing = makeOverridable (import ../os-specific/linux/kernel/linux-testing.nix) {
72027211
inherit fetchurl stdenv perl buildLinux;
72037212
kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips")
@@ -7337,8 +7346,8 @@ let
73377346
linuxPackages = linuxPackages_3_12;
73387347

73397348
# Update this when adding the newest kernel major version!
7340-
linux_latest = pkgs.linux_3_14;
7341-
linuxPackages_latest = pkgs.linuxPackages_3_14;
7349+
linux_latest = pkgs.linux_3_15;
7350+
linuxPackages_latest = pkgs.linuxPackages_3_15;
73427351

73437352
# Build the kernel modules for the some of the kernels.
73447353
linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2);
@@ -7350,6 +7359,7 @@ let
73507359
linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12);
73517360
linuxPackages_3_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_13 linuxPackages_3_13);
73527361
linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
7362+
linuxPackages_3_15 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_15 linuxPackages_3_15);
73537363
linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);
73547364

73557365
# grsecurity flavors

0 commit comments

Comments
 (0)