Add support for Intel's 4965AGN firmware.

svn path=/nixos/trunk/; revision=10735

system/options.nix

@@ -376,7 +376,15 @@
       default = false;
       description = "
         This option enables automatic loading of the firmware for the Intel
-        PRO/Wireless 3945ABG / 4965AGN.
+        PRO/Wireless 3945ABG.
+      ";
+    };
+
+    enableIntel4965AGNFirmware = mkOption {
+      default = false;
+      description = "
+        This option enables automatic loading of the firmware for the Intel
+        PRO/Wireless 4965AGN.
       ";
     };
 

system/system.nix

@@ -140,6 +140,7 @@ rec {
   modulesTree = pkgs.module_aggregation (
     [kernel]
     ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi
+    ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi
     # !!! this should be declared by the xserver Upstart job.
     ++ pkgs.lib.optional (config.services.xserver.enable && config.services.xserver.videoDriver == "nvidia") pkgs.nvidiaDrivers
     ++ pkgs.lib.optional config.hardware.enableGo7007 pkgs.wis_go7007

upstart-jobs/default.nix

@@ -28,6 +28,7 @@ let
       firmwareDirs =
            pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw
         ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode
+        ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware pkgs.iwlwifi4965ucode
 	++ config.services.udev.addFirmware;
       extraUdevPkgs =
            pkgs.lib.optional config.services.hal.enable pkgs.hal