summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRicardo M. Correia <rcorreia@wizy.org>2014-09-08 15:15:54 +0200
committerRicardo M. Correia <rcorreia@wizy.org>2014-09-08 15:15:54 +0200
commitc155ae31ee2dd9c27f0e5757b56978a716bcf415 (patch)
tree7ac06c12d2f3bbefdf06db0029a2bcfbd6d90276 /pkgs
parent99d0c10a0b0bd9359f3e47fb271f6f7fb274960a (diff)
parent844aef5bcf19ae7e362bceb981b17fa7a59c2c9c (diff)
downloadnixpkgs-c155ae31ee2dd9c27f0e5757b56978a716bcf415.tar
nixpkgs-c155ae31ee2dd9c27f0e5757b56978a716bcf415.tar.gz
nixpkgs-c155ae31ee2dd9c27f0e5757b56978a716bcf415.tar.bz2
nixpkgs-c155ae31ee2dd9c27f0e5757b56978a716bcf415.tar.lz
nixpkgs-c155ae31ee2dd9c27f0e5757b56978a716bcf415.tar.xz
nixpkgs-c155ae31ee2dd9c27f0e5757b56978a716bcf415.tar.zst
nixpkgs-c155ae31ee2dd9c27f0e5757b56978a716bcf415.zip
Merge pull request #3992 from wkennington/master.kernel
Kernel Updates
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.10.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.14.nix4
-rw-r--r--pkgs/os-specific/linux/kernel/linux-3.16.nix4
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 8fa684e407c..e888afc2c6d 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.53";
+  version = "3.10.54";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1sxa6ppgpy9fgj4lyj8d53y309v6r5nmifbrcf5pqs6l944frhq6";
+    sha256 = "0rhwdkw0ia8bpi237006y0m84vfvqz38l0z2dvqy2shg8ywf24ya";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 74d83345ec1..5dc570f1998 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.17";
+  version = "3.14.18";
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1dl9skwd1xvkdm9gblidcawkck6x5slb41gbx0i8jxby2k6w6i5n";
+    sha256 = "0i0b35qmpxvfkflf079dhfx3yfjbh0dgqs7qzxrhs9sw4jf73z75";
   };
 
   features.iwlwifi = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.16.nix b/pkgs/os-specific/linux/kernel/linux-3.16.nix
index be2e68ab81e..c41e1bce107 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.16.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.16.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.16.1";
+  version = "3.16.2";
   extraMeta.branch = "3.16";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0wbxqlmk7w9047ir51dsz6vi7ww0hpycgrb43mk2a189xaldsdxy";
+    sha256 = "16l5l099qv367d3gknpbycgrakli2mdklvgaifsn3hcrrjs44ybf";
   };
 
   features.iwlwifi = true;