diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-11-14 22:54:17 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-11-14 23:03:54 -0800 |
| commit | f4a27311b730e83591ae72e177bbc63dc8f52d98 (patch) | |
| tree | 933b2ae23d553eeb129e333212bc368f8d00f56b /pkgs | |
| parent | 0ef4ee5d061fdc1b76fc20c6a3e757d4a1935304 (diff) | |
| download | nixpkgs-f4a27311b730e83591ae72e177bbc63dc8f52d98.tar nixpkgs-f4a27311b730e83591ae72e177bbc63dc8f52d98.tar.gz nixpkgs-f4a27311b730e83591ae72e177bbc63dc8f52d98.tar.bz2 nixpkgs-f4a27311b730e83591ae72e177bbc63dc8f52d98.tar.lz nixpkgs-f4a27311b730e83591ae72e177bbc63dc8f52d98.tar.xz nixpkgs-f4a27311b730e83591ae72e177bbc63dc8f52d98.tar.zst nixpkgs-f4a27311b730e83591ae72e177bbc63dc8f52d98.zip | |
kernel: 3.14.23 -> 3.14.24
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/patches.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 4d95f0acfee..27b09a74f24 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"; # Remember to update grsecurity! - version = "3.14.23"; extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1zqh7fza318yv04qssw9lkcxpw590vrigbdrswcr885iwk561cb8"; + sha256 = "0wix7w8sn222lsfgkbpzb44q4s7c5rb13z2h07m5111p57jyvalw"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 79969b45eb9..4ca363341ec 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.23"; - revision = "201411091053"; + { kversion = "3.14.24"; + revision = "201411150026"; branch = "stable"; - sha256 = "0fs084zggxvqswjs296bnvlvplalg7r60zbccmgrr2j1xa7s4pfl"; + sha256 = "1vrsidq4vsbb5s88k27l5n2mwgwwfz1qpwcvxwgncrkr4gaxzwrn"; }; grsecurity_unstable = grsecPatch |