Add Intel Wi-Fi firmware for kernels 2.6.27 and later;

make `iwlwifi4965ucode' part of `kernelPackagesFor'.

svn path=/nixpkgs/trunk/; revision=13429

pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/default.nix

@@ -22,6 +22,14 @@ stdenv.mkDerivation rec {
   
   meta = {
     description = "Firmware for the Intel 4965ABG wireless card";
+
+    longDescription = ''
+      This package provides version 2 of the Intel wireless card
+      firmware, for Linux up to 2.6.26.  It contains the
+      `iwlwifi-4965-1.ucode' file, which is loaded by the `iw4965'
+      driver found in recent kernels.
+    '';
+
     homepage = http://intellinuxwireless.org/;
   };
 }

pkgs/os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix

@@ -0,0 +1,31 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "iwlwifi-4965-ucode-228.57.2.21";
+  
+  src = fetchurl {
+    url = "http://intellinuxwireless.org/iwlwifi/downloads/" + name + ".tgz";
+    sha256 = "1ss8r9l8j28n4zplpcwf81n74yy7p4q9dldnblmh4g0h9nyr8nf0";
+  };
+  
+  buildPhase = "true";
+
+  installPhase = ''
+    ensureDir "$out"
+    chmod -x *
+    cp * "$out"
+  '';
+  
+  meta = {
+    description = "Firmware for the Intel 4965ABG wireless card, for Linux 2.6.27+";
+
+    longDescription = ''
+      This package provides version 2 of the Intel wireless card
+      firmware, for Linux 2.6.27 and later.  It contains the
+      `iwlwifi-4965-2.ucode' file, which is loaded by the `iwlagn'
+      driver found in recent kernels.
+    '';
+
+    homepage = http://intellinuxwireless.org/;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -5929,7 +5929,11 @@ let
     inherit fetchurl stdenv;
   };
 
-  iwlwifi4965ucode = import ../os-specific/linux/firmware/iwlwifi-4965-ucode {
+  iwlwifi4965ucodeV1 = import ../os-specific/linux/firmware/iwlwifi-4965-ucode {
+    inherit fetchurl stdenv;
+  };
+
+  iwlwifi4965ucodeV2 = import ../os-specific/linux/firmware/iwlwifi-4965-ucode/version-2.nix {
     inherit fetchurl stdenv;
   };
 
@@ -6262,6 +6266,12 @@ let
       inherit fetchurl stdenv kernel;
     };
 
+    iwlwifi4965ucode =
+      (if (builtins.compareVersions kernel.version "2.6.27" == 0)
+          || (builtins.compareVersions kernel.version "2.6.27" == 1)
+       then iwlwifi4965ucodeV2
+       else iwlwifi4965ucodeV1);
+
     atheros = composedArgsAndFun (selectVersion ../os-specific/linux/atheros "0.9.4") {
       inherit fetchurl stdenv builderDefs kernel lib;
     };
@@ -7387,6 +7397,7 @@ let
     inherit fetchurl stdenv lzma pkgconfig perl zip libjpeg libpng zlib cairo
       python dbus dbus_glib freetype fontconfig bzip2 xlibs;
     inherit (gnome) libIDL libgnomeui gnomevfs gtk pango;
+    xulrunner = icecatXulrunner3;
   });
 
   icecatXulrunner3 = lowPrio (import ../applications/networking/browsers/icecat-3 {