diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-01-29 22:27:41 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-01-31 18:55:09 -0800 |
| commit | bbd6384f62d9570f2b4dab1a51f8a9bb44e2fb9a (patch) | |
| tree | 7fa383900e90debd568226cb49962f76f3117c42 /pkgs/os-specific/linux | |
| parent | 8a2f7375d6fd3ba62c6cd540197f621646a0e7c0 (diff) | |
| download | nixlib-bbd6384f62d9570f2b4dab1a51f8a9bb44e2fb9a.tar nixlib-bbd6384f62d9570f2b4dab1a51f8a9bb44e2fb9a.tar.gz nixlib-bbd6384f62d9570f2b4dab1a51f8a9bb44e2fb9a.tar.bz2 nixlib-bbd6384f62d9570f2b4dab1a51f8a9bb44e2fb9a.tar.lz nixlib-bbd6384f62d9570f2b4dab1a51f8a9bb44e2fb9a.tar.xz nixlib-bbd6384f62d9570f2b4dab1a51f8a9bb44e2fb9a.tar.zst nixlib-bbd6384f62d9570f2b4dab1a51f8a9bb44e2fb9a.zip | |
kernel: 3.14.29 -> 3.14.31
Diffstat (limited to 'pkgs/os-specific/linux')
| -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 b4fd4eeefbc6..05e0722103f1 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.29"; + version = "3.14.31"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0hklzp0bv7f1pbhwgi84k2iqv9lb2aai1jgxzdrzilp6sz9z8f5v"; + sha256 = "1j271f1mz40kh7hw44az549dr2413vyg22nwsz61garyvrxndpd6"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index b0c0c04c0094..3fa42322b588 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -65,10 +65,10 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.29"; - revision = "201501211943"; + { kversion = "3.14.31"; + revision = "201501310705"; branch = "stable"; - sha256 = "0kg33pzvs3dls0g6z9qxhmahiwy0asjpsp6hfcivhsri3kznwi6d"; + sha256 = "19zm0ynjnk01qcp157v60s313fxm45dx9cc30rnpfig03r5p0la8"; }; grsecurity_unstable = grsecPatch |