From 45135c0256b15f80dafbd281107ca489d2c09735 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 14 Jul 2015 07:31:18 +0200
Subject: linux-testing: Update to version 4.2.0-rc2.

Upstream diff of changes can be found at:

https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/diff/?id=v4.2-rc2&id2=v4.2-rc1&dt=2

Not tested on my machine right now (well, it's "testing" after all), but
verified the SHA256 from two different connections.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/os-specific')

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index acfe421ac105..0c31c558c47e 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.2-rc1";
-  modDirVersion = "4.2.0-rc1";
+  version = "4.2-rc2";
+  modDirVersion = "4.2.0-rc2";
   extraMeta.branch = "4.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "0a9zr1jf2c110lvd7wi4jxxk2iw6san31yh8hwlahkkb8kh4wliw";
+    sha256 = "068g71ns8d2j66hppmnssilf185p33w7argb0r2w9kplqq2ac99w";
   };
 
   features.iwlwifi = true;
-- 
cgit 1.4.1


From 52b78864a8ffd8ccf121dd207019b4dfaa6e48cd Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Mon, 13 Jul 2015 23:53:13 -0700
Subject: firmware-linux-nonfree: 2015-06-30 -> 2015-07-12

---
 pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/os-specific')

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index dc166da3ae1d..bbe35fe96996 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2015-06-30";
+  version = "2015-07-12";
 
   src = fetchgit {
     url = "http://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/linux-firmware.git";
-    rev = "ea901a57054441907e9b127ad407a8554532f992";
-    sha256 = "00899r0gakdy2vpgq5zbhbxrl4kyczg1kybv1h3m2lrk9a0j7v67";
+    rev = "5e6d7a9d70b562c60471e234f78137020d65ccbf";
+    sha256 = "06gvjdqpbayfv696hxn9xjkbzddj1hy6z9aahi156lvj96qb9z49";
   };
 
   preInstall = ''
-- 
cgit 1.4.1