about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-02-07 12:04:49 -0800
committerWilliam A. Kennington III <william@wkennington.com>2015-02-07 12:08:09 -0800
commitc4d21cf1c4497f3f0fc04b65704ff6e324eb8813 (patch)
tree24cb091ce53247c55d6180e4534e5448020f4ae7 /pkgs/os-specific
parentf103b0f78b2e22512b785845f2039547a0c6fad9 (diff)
downloadnixlib-c4d21cf1c4497f3f0fc04b65704ff6e324eb8813.tar
nixlib-c4d21cf1c4497f3f0fc04b65704ff6e324eb8813.tar.gz
nixlib-c4d21cf1c4497f3f0fc04b65704ff6e324eb8813.tar.bz2
nixlib-c4d21cf1c4497f3f0fc04b65704ff6e324eb8813.tar.lz
nixlib-c4d21cf1c4497f3f0fc04b65704ff6e324eb8813.tar.xz
nixlib-c4d21cf1c4497f3f0fc04b65704ff6e324eb8813.tar.zst
nixlib-c4d21cf1c4497f3f0fc04b65704ff6e324eb8813.zip
kernel: 3.14.31 -> 3.14.32
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.14.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/patches.nix6
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 05e0722103f1..30af9e562e6d 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.31";
+  version = "3.14.32";
   # Remember to update grsecurity!
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1j271f1mz40kh7hw44az549dr2413vyg22nwsz61garyvrxndpd6";
+    sha256 = "1dmmb8z641ak5fsm3al5j6ifh77dvm94npwhvwmr0wp6z8k76w02";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 246453721e62..6c8047ab1d4c 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.31";
-      revision  = "201501310705";
+    { kversion  = "3.14.32";
+      revision  = "201502062101";
       branch    = "stable";
-      sha256    = "19zm0ynjnk01qcp157v60s313fxm45dx9cc30rnpfig03r5p0la8";
+      sha256    = "1qni3x6kwrhgqbhwm02m9wnmz7y2ydwwxw9ckk06xyq3j9qgv3aj";
     };
 
   grsecurity_unstable = grsecPatch