From 7fcfcb2614d3893cb3751cc61163b4556d0d5f1c Mon Sep 17 00:00:00 2001
From: Jack Cummings <jack@mudshark.org>
Date: Fri, 8 Mar 2013 07:40:47 -0800
Subject: [PATCH] linux-firmware.git moved, and so did the intel wireless
 firmware urls.

---
 pkgs/os-specific/linux/firmware/bcm43xx/default.nix        | 4 ++--
 .../linux/firmware/iwlwifi-4965-ucode/version-2.nix        | 7 ++++---
 .../linux/firmware/iwlwifi-5000-ucode/default.nix          | 5 +++--
 pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix     | 3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
index edc15a360ff..fb43c7d67e1 100644
--- a/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
+++ b/pkgs/os-specific/linux/firmware/bcm43xx/default.nix
@@ -2,13 +2,13 @@
 
 let
   src1 = fetchurl {
-    url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx_hdr-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e";
+    url = "http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx_hdr-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e";
     sha256 = "d02549964d21dd90fc35806483b9fc871d93d7d38ae1a70a9ce006103c2a3de3";
     name = "bcm43xx_hdr-0.fw";
   };
 
   src2 = fetchurl {
-    url = "https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e";
+    url = "https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=blob_plain;f=brcm/bcm43xx-0.fw;hb=15888a2eab052ac3d3f49334e4f6f05f347a516e";
     sha256 = "f90f685903127e4db431fe1efccefebf77272712bd4bfe46d1d1d5825ee52797";
     name = "bcm43xx-0.fw";
   };
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix
index e1771c7a5cf..3e15374c65f 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix
@@ -1,11 +1,12 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "iwlwifi-4965-ucode-228.57.2.21";
+  name = "iwlwifi-4965-ucode-228.61.2.24";
   
   src = fetchurl {
-    url = "http://intellinuxwireless.org/iwlwifi/downloads/" + name + ".tgz";
-    sha256 = "1ss8r9l8j28n4zplpcwf81n74yy7p4q9dldnblmh4g0h9nyr8nf0";
+    url = "http://wireless.kernel.org/en/users/Drivers/iwlegacy?action=AttachFile&do=get&target=iwlwifi-4965-ucode-228.61.2.24.tgz";
+    name = "iwlwifi-4965-ucode-228.61.2.24.tgz";
+    sha256 = "1n5af3cci0v40w4gr0hplqr1lfvhghlbzdbf60d6185vpcny2l5m";
   };
   
   buildPhase = "true";
diff --git a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix
index 49269fffe47..8805f1393fb 100644
--- a/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix
+++ b/pkgs/os-specific/linux/firmware/iwlwifi-5000-ucode/default.nix
@@ -4,8 +4,9 @@ stdenv.mkDerivation rec {
   name = "iwlwifi-5000-ucode-8.83.5.1-1";
   
   src = fetchurl {
-    url = "http://www.intellinuxwireless.org/iwlwifi/downloads/${name}.tar.gz";
-    sha256 = "0n4f6wsppspvvdpcab52n2piczhgfq7a4y7gazxzzlj5halchnx3";
+    url = "http://wireless.kernel.org/en/users/Drivers/iwlwifi?action=AttachFile&do=get&target=iwlwifi-5000-ucode-8.83.5.1-1.tgz";
+    name = "iwlwifi-5000-ucode-8.83.5.1-1.tgz";
+    sha256 = "0pkzr4gflp3j0jm4rw66jypk3xn4bvpgdsnxjqwanyd64aj6naxg";
   };
   
   buildPhase = "true";
diff --git a/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix b/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix
index a73ae978597..dbd2fa45b7b 100644
--- a/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix
+++ b/pkgs/os-specific/linux/firmware/rtl8168e-2/default.nix
@@ -1,8 +1,9 @@
 { stdenv, fetchurl }:
 
+# http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
 let
   src = fetchurl {
-    url = "http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=blob_plain;f=rtl_nic/rtl8168e-2.fw";
+    url = "http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=blob_plain;f=rtl_nic/rtl8168e-2.fw";
     sha256 = "11lkwc6r6f5pi8clxajp43j6dzapydgxaxaschribpvhn8lrjj0a";
     name = "rtl8168e-2.fw";
   };