From d29b8323e1ad3341d27619743172be6ae702aef5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 29 Apr 2009 14:51:17 +0000 Subject: [PATCH] * Support loading the Intel 5000 firmware. svn path=/nixos/trunk/; revision=15396 --- system/options.nix | 9 +++++++++ upstart-jobs/default.nix | 1 + 2 files changed, 10 insertions(+) diff --git a/system/options.nix b/system/options.nix index 20152ddc206..ef73fcb7ec0 100644 --- a/system/options.nix +++ b/system/options.nix @@ -429,6 +429,15 @@ in "; }; + enableIntel5000Firmware = mkOption { + default = false; + merge = obsoleteMerge; + description = " + This option enables automatic loading of the firmware for the Intel + PRO/Wireless 5000. + "; + }; + enableZydasZD1211Firmware = mkOption { default = false; merge = obsoleteMerge; diff --git a/upstart-jobs/default.nix b/upstart-jobs/default.nix index 9df21fb57a5..581ea53fee0 100644 --- a/upstart-jobs/default.nix +++ b/upstart-jobs/default.nix @@ -97,6 +97,7 @@ let pkgs.lib.optional config.networking.enableIntel2200BGFirmware pkgs.ipw2200fw ++ pkgs.lib.optional config.networking.enableIntel3945ABGFirmware pkgs.iwlwifi3945ucode ++ pkgs.lib.optional config.networking.enableIntel4965AGNFirmware kernelPackages.iwlwifi4965ucode + ++ pkgs.lib.optional config.networking.enableIntel5000Firmware kernelPackages.iwlwifi5000ucode ++ pkgs.lib.optional config.networking.enableZydasZD1211Firmware pkgs.zd1211fw ++ pkgs.lib.optional config.hardware.enableGo7007 "${kernelPackages.wis_go7007}/firmware" ++ config.services.udev.addFirmware