mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 23:36:17 +01:00
Use the Debian firmware package instead of the Intel-specific ones
The intel-*.nix modules are obsolete (since you can just say ‘hardware.enableAllFirmware = true’, or equivalently, ‘hardware.firmware = [ pkgs.firmwareLinuxNonfree ]’). But we'll keep them around for compatibility.
This commit is contained in:
parent
6246d75654
commit
fc2fc63f4c
10 changed files with 15 additions and 37 deletions
|
@ -1,5 +1,3 @@
|
|||
{pkgs, config, ...}:
|
||||
|
||||
{
|
||||
hardware.firmware = [ pkgs.iwlwifi2030ucode ];
|
||||
hardware.enableAllFirmware = true;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, config, ...}:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
|
||||
|
@ -12,9 +12,7 @@
|
|||
description = ''
|
||||
Turn on this option if you want firmware for the Intel
|
||||
PRO/Wireless 2100BG to be loaded automatically. This is
|
||||
required if you want to use this device. Intel requires you to
|
||||
accept the license for this firmware, see
|
||||
<link xlink:href='http://ipw2100.sourceforge.net/firmware.php?fid=2'/>.
|
||||
required if you want to use this device.
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -25,9 +23,7 @@
|
|||
|
||||
config = pkgs.lib.mkIf config.networking.enableIntel2100BGFirmware {
|
||||
|
||||
# Warning: setting this option requires acceptance of the firmware
|
||||
# license, see http://ipw2100.sourceforge.net/firmware.php?fid=2.
|
||||
hardware.firmware = [ pkgs.ipw2100fw ];
|
||||
hardware.enableAllFirmware = true;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, config, ...}:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
|
||||
|
@ -12,9 +12,7 @@
|
|||
description = ''
|
||||
Turn on this option if you want firmware for the Intel
|
||||
PRO/Wireless 2200BG to be loaded automatically. This is
|
||||
required if you want to use this device. Intel requires you to
|
||||
accept the license for this firmware, see
|
||||
<link xlink:href='http://ipw2200.sourceforge.net/firmware.php?fid=7'/>.
|
||||
required if you want to use this device.
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -25,9 +23,7 @@
|
|||
|
||||
config = pkgs.lib.mkIf config.networking.enableIntel2200BGFirmware {
|
||||
|
||||
# Warning: setting this option requires acceptance of the firmware
|
||||
# license, see http://ipw2200.sourceforge.net/firmware.php?fid=7.
|
||||
hardware.firmware = [ pkgs.ipw2200fw ];
|
||||
hardware.enableAllFirmware = true;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, config, ...}:
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
|||
|
||||
config = pkgs.lib.mkIf config.networking.enableIntel3945ABGFirmware {
|
||||
|
||||
hardware.firmware = [ pkgs.iwlwifi3945ucode ];
|
||||
hardware.enableAllFirmware = true;
|
||||
|
||||
};
|
||||
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
{pkgs, config, ...}:
|
||||
|
||||
{
|
||||
hardware.firmware = [ config.boot.kernelPackages.iwlwifi4965ucode ];
|
||||
hardware.enableAllFirmware = true;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
{pkgs, config, ...}:
|
||||
|
||||
{
|
||||
hardware.firmware = [ pkgs.iwlwifi5000ucode ];
|
||||
hardware.enableAllFirmware = true;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
{pkgs, config, ...}:
|
||||
|
||||
{
|
||||
hardware.firmware = [ pkgs.iwlwifi5150ucode ];
|
||||
hardware.enableAllFirmware = true;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
{pkgs, config, ...}:
|
||||
|
||||
{
|
||||
hardware.firmware = [ pkgs.iwlwifi6000ucode ];
|
||||
hardware.enableAllFirmware = true;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
{pkgs, config, ...}:
|
||||
|
||||
{
|
||||
hardware.firmware = [ pkgs.iwlwifi6000g2aucode ];
|
||||
hardware.enableAllFirmware = true;
|
||||
}
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
{pkgs, config, ...}:
|
||||
|
||||
{
|
||||
hardware.firmware = [ pkgs.iwlwifi6000g2bucode ];
|
||||
hardware.enableAllFirmware = true;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue