diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-12-08 23:21:12 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-12-08 23:24:50 -0800 |
| commit | 042f266e10d77202c6988dcd79dd2d6aa5476f3d (patch) | |
| tree | af3e685fdc1eac8aff982f42fb2326446841d759 /pkgs | |
| parent | c8abfe37abb2c84ad9496a27771d11a4fd1731ec (diff) | |
| download | nixlib-042f266e10d77202c6988dcd79dd2d6aa5476f3d.tar nixlib-042f266e10d77202c6988dcd79dd2d6aa5476f3d.tar.gz nixlib-042f266e10d77202c6988dcd79dd2d6aa5476f3d.tar.bz2 nixlib-042f266e10d77202c6988dcd79dd2d6aa5476f3d.tar.lz nixlib-042f266e10d77202c6988dcd79dd2d6aa5476f3d.tar.xz nixlib-042f266e10d77202c6988dcd79dd2d6aa5476f3d.tar.zst nixlib-042f266e10d77202c6988dcd79dd2d6aa5476f3d.zip | |
kernel: 3.14.25 -> 3.14.26
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 c301a312112e..c0a88c6a4951 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.25"; + version = "3.14.26"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "07zwiywmijg5z8iy628w9f8rhi8j4hjd3raczq9pm7dqryayyaj2"; + sha256 = "16sjrpgyl1h812czx1sj06b3krbkb7cxpjmd7snmdd1cc5b8h25q"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 09f15e696bb8..ba6fb2a88867 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.25"; - revision = "201412040016"; + { kversion = "3.14.26"; + revision = "201412071005"; branch = "stable"; - sha256 = "0mifqb67v9y8qdsq6kr08gmd05c57575cv2xz1k0djgmjb3hvnpp"; + sha256 = "1dy98l1kqc20735385pahwksjqmsk4j5vd6d39l61y6rwc9iqfan"; }; grsecurity_unstable = grsecPatch |