From 58a04a935976a04543559d8f13ef86ba72905679 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 12 Feb 2015 14:29:00 -0800 Subject: kernel: 3.14.32 -> 3.14.33 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 30af9e562e6d..156c5cced8f7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.32"; + version = "3.14.33"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1dmmb8z641ak5fsm3al5j6ifh77dvm94npwhvwmr0wp6z8k76w02"; + sha256 = "07wqh93z5hix5aga2ns8fnkz350i2sx2l7gzr7n6136gbcb5lxb6"; }; features.iwlwifi = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db0e9f79c3d4..f5d7e12450fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8676,7 +8676,7 @@ let linux_3_14 = makeOverridable (import ../os-specific/linux/kernel/linux-3.14.nix) { inherit fetchurl stdenv perl buildLinux; - kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.crc_regression ] + kernelPatches = [ kernelPatches.bridge_stp_helper ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill -- cgit 1.4.1