JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #30172 from mayflower/cleanup/firmware-modules

Browse Source 
nixos: clean up wifi firmware & default kernel modules
This commit is contained in:
Franz Pletz 2017-10-12 16:32:01 +02:00 committed by GitHub
commit e13d0c3435
16 changed files with 9 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/hardware/network/intel-2030.nix
View File

@ -1,3 +0,0 @@
{
hardware.enableRedistributableFirmware = true;
}

30
nixos/modules/hardware/network/intel-2100bg.nix
View File

@ -1,30 +0,0 @@
{ config, pkgs, lib, ... }:
{
###### interface
options = {
networking.enableIntel2100BGFirmware = lib.mkOption {
default = false;
type = lib.types.bool;
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.
'';
};
};
###### implementation
config = lib.mkIf config.networking.enableIntel2100BGFirmware {
hardware.enableRedistributableFirmware = true;
};
}

29
nixos/modules/hardware/network/intel-3945abg.nix
View File

@ -1,29 +0,0 @@
{ config, pkgs, lib, ... }:
{
###### interface
options = {
networking.enableIntel3945ABGFirmware = lib.mkOption {
default = false;
type = lib.types.bool;
description = ''
This option enables automatic loading of the firmware for the Intel
PRO/Wireless 3945ABG.
'';
};
};
###### implementation
config = lib.mkIf config.networking.enableIntel3945ABGFirmware {
hardware.enableRedistributableFirmware = true;
};
}

3
nixos/modules/hardware/network/intel-4965agn.nix
View File

@ -1,3 +0,0 @@
{
hardware.enableRedistributableFirmware = true;
}

3
nixos/modules/hardware/network/intel-5000.nix
View File

@ -1,3 +0,0 @@
{
hardware.enableRedistributableFirmware = true;
}

3
nixos/modules/hardware/network/intel-5150.nix
View File

@ -1,3 +0,0 @@
{
hardware.enableRedistributableFirmware = true;
}

3
nixos/modules/hardware/network/intel-6000.nix
View File

@ -1,3 +0,0 @@
{
hardware.enableRedistributableFirmware = true;
}

3
nixos/modules/hardware/network/intel-6000g2a.nix
View File

@ -1,3 +0,0 @@
{
hardware.enableRedistributableFirmware = true;
}

3
nixos/modules/hardware/network/intel-6000g2b.nix
View File

@ -1,3 +0,0 @@
{
hardware.enableRedistributableFirmware = true;
}

26
nixos/modules/hardware/network/ralink.nix
View File

@ -1,26 +0,0 @@
{pkgs, config, lib, ...}:
{
###### interface
options = {
networking.enableRalinkFirmware = lib.mkOption {
default = false;
type = lib.types.bool;
description = ''
Turn on this option if you want firmware for the RT73 NIC.
'';
};
};
###### implementation
config = lib.mkIf config.networking.enableRalinkFirmware {
hardware.enableRedistributableFirmware = true;
};
}

26
nixos/modules/hardware/network/rtl8192c.nix
View File

@ -1,26 +0,0 @@
{pkgs, config, lib, ...}:
{
###### interface
options = {
networking.enableRTL8192cFirmware = lib.mkOption {
default = false;
type = lib.types.bool;
description = ''
Turn on this option if you want firmware for the RTL8192c (and related) NICs.
'';
};
};
###### implementation
config = lib.mkIf config.networking.enableRTL8192cFirmware {
hardware.enableRedistributableFirmware = true;
};
}

5
nixos/modules/installer/scan/detected.nix
View File

@ -6,8 +6,7 @@ with lib;
{
config = mkDefault {
# Wireless card firmware
networking.enableIntel2200BGFirmware = true;
networking.enableIntel3945ABGFirmware = true;
# Common firmware, i.e. for wifi cards
hardware.enableRedistributableFirmware = true;
};
}

5
nixos/modules/module-list.nix
View File

@ -35,11 +35,6 @@
./hardware/ksm.nix
./hardware/mcelog.nix
./hardware/network/b43.nix
./hardware/network/intel-2100bg.nix
./hardware/network/intel-2200bg.nix
./hardware/network/intel-3945abg.nix
./hardware/network/ralink.nix
./hardware/network/rtl8192c.nix
./hardware/nitrokey.nix
./hardware/opengl.nix
./hardware/pcmcia.nix

3
nixos/modules/profiles/all-hardware.nix
View File

@ -47,9 +47,6 @@
# Hyper-V support.
"hv_storvsc"
# Keyboards
"usbhid" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
];
# Include lots of firmware.

6
nixos/modules/rename.nix
View File

@ -11,7 +11,11 @@ with lib;
(mkRenamedOptionModule [ "fonts" "extraFonts" ] [ "fonts" "fonts" ])
(mkRenamedOptionModule [ "networking" "enableWLAN" ] [ "networking" "wireless" "enable" ])
(mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
(mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "networking" "enableIntel3945ABGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "networking" "enableIntel2100BGFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "networking" "enableRalinkFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "networking" "enableRTL8192cFirmware" ] [ "hardware" "enableRedistributableFirmware" ])
(mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
(mkChangedOptionModule [ "services" "printing" "gutenprint" ] [ "services" "printing" "drivers" ]

17
nixos/modules/system/boot/kernel.nix
View File

@ -193,11 +193,6 @@ in
"sd_mod"
"sr_mod"
# Standard IDE stuff.
"ide_cd"
"ide_disk"
"ide_generic"
# SD cards and internal eMMC drives.
"mmc_block"
@ -211,21 +206,11 @@ in
"xhci_hcd"
"xhci_pci"
"usbhid"
"hid_generic" "hid_lenovo"
"hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat"
"hid_generic" "hid_lenovo" "hid_apple" "hid_roccat"
# Misc. keyboard stuff.
"pcips2" "atkbd" "i8042"
# Temporary fix for https://github.com/NixOS/nixpkgs/issues/18451
# Remove as soon as upstream gets fixed - marking it:
# TODO
# FIXME
"i8042"
# To wait for SCSI devices to appear.
"scsi_wait_scan"
# Needed by the stage 2 init script.
"rtc_cmos"
];