diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-02-07 12:04:56 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-02-07 12:07:17 -0800 |
| commit | f103b0f78b2e22512b785845f2039547a0c6fad9 (patch) | |
| tree | 18e7976b23d25c029622c69047f2aca9a5a5f148 /pkgs | |
| parent | 321743728d4362f2f2a1358a3974da954d9396f6 (diff) | |
| download | nixlib-f103b0f78b2e22512b785845f2039547a0c6fad9.tar nixlib-f103b0f78b2e22512b785845f2039547a0c6fad9.tar.gz nixlib-f103b0f78b2e22512b785845f2039547a0c6fad9.tar.bz2 nixlib-f103b0f78b2e22512b785845f2039547a0c6fad9.tar.lz nixlib-f103b0f78b2e22512b785845f2039547a0c6fad9.tar.xz nixlib-f103b0f78b2e22512b785845f2039547a0c6fad9.tar.zst nixlib-f103b0f78b2e22512b785845f2039547a0c6fad9.zip | |
kernel: 3.18.5 -> 3.18.6
Diffstat (limited to 'pkgs')
| -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 ae6a3e3435a0..73c17f6c1ca3 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.5"; + version = "3.18.6"; # Remember to update grsecurity! extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "147wf0igbsjlwhh8zam0xpw76ysc8cm2x3fkk2g1cx4wwlv28i74"; + sha256 = "1xaky9yqkpa63936z7h4x3pxp4z45jwhslxpg4nmgakk262a9hf4"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 3fa42322b588..246453721e62 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.5"; - revision = "201501310706"; + { kversion = "3.18.6"; + revision = "201502062100"; branch = "test"; - sha256 = "098jikfxh9sk097lrajyzf4x6dbxwwhpkirmqn25rn004y5y7ysn"; + sha256 = "11cy7qqkahd323hmi67r4psgryapk1qwamm9m15rhbfqgq428306"; }; grsec_fix_path = |