about summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/linux-3.19.nix
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-05-01 15:57:09 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-05-01 15:57:09 -0700
commit00df204c82bd6d585c3f19d1a31588fa72519184 (patch)
tree4201fed8adf0505e787b9cf335cd52a7ad657570 /pkgs/os-specific/linux/kernel/linux-3.19.nix
parent8591db4b10e50ad3b61b1708787e4de314424d5d (diff)
parentcf0b6b7be866aaeac75c2ee24245a7bb6ba633b2 (diff)
downloadnixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar
nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.gz
nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.bz2
nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.lz
nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.xz
nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.zst
nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.zip
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/os-specific/linux/kernel/linux-3.19.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.19.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.19.nix b/pkgs/os-specific/linux/kernel/linux-3.19.nix
index 79302819d7c9..293b0abf9f34 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.19.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.19.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.19.5";
+  version = "3.19.6";
   # Remember to update grsecurity!
   extraMeta.branch = "3.19";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0s2yiyk1ks0z2fj8a8g56hkp6mfyvh9c34m1jpixhg9zck9xjdix";
+    sha256 = "1kqn796vwkmhj2qkv56nj7anpmxx1hxv47cf44fcmx9n1afry8j4";
   };
 
   features.iwlwifi = true;