diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 27b09a74f246..c301a312112e 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.24"; + version = "3.14.25"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0wix7w8sn222lsfgkbpzb44q4s7c5rb13z2h07m5111p57jyvalw"; + sha256 = "07zwiywmijg5z8iy628w9f8rhi8j4hjd3raczq9pm7dqryayyaj2"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 580ed226df01..b0b9d96e95c5 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,10 +60,10 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.24"; - revision = "201411150026"; + { kversion = "3.14.25"; + revision = "201411220954"; branch = "stable"; - sha256 = "1vrsidq4vsbb5s88k27l5n2mwgwwfz1qpwcvxwgncrkr4gaxzwrn"; + sha256 = "01x2i1r96r29s8sp2bl642ifwilfx7lh3id6a8sz6d0nf3mfypln"; }; grsecurity_unstable = grsecPatch