diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-01-29 22:27:47 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-01-31 18:54:59 -0800 |
| commit | 8a2f7375d6fd3ba62c6cd540197f621646a0e7c0 (patch) | |
| tree | d21cd98a1d09727e228e8ba32bf47a00d1bf6b5b /pkgs/os-specific | |
| parent | 3e1b504cbe2006ba077dcde9246b179e015d7b80 (diff) | |
kernel: 3.18.3 -> 3.18.5
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/linux-3.18.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.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index dc56325666a25..ae6a3e3435a0c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.3"; + version = "3.18.5"; # Remember to update grsecurity! extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0ma2x68975xsi9kb15p0615nx9sm5ppb309kfdz7fgx9pg84q0hf"; + sha256 = "147wf0igbsjlwhh8zam0xpw76ysc8cm2x3fkk2g1cx4wwlv28i74"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2d0b4b7a108ac..b0c0c04c00948 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -72,10 +72,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "3.18.3"; - revision = "201501211944"; + { kversion = "3.18.5"; + revision = "201501310706"; branch = "test"; - sha256 = "12yz93l6442l6z41ama0nng6hzmnrc7jk3ha22cdypg06ybfjciv"; + sha256 = "098jikfxh9sk097lrajyzf4x6dbxwwhpkirmqn25rn004y5y7ysn"; }; grsec_fix_path = |