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

Merge pull request #25636 from Mic92/firmware

Browse Source 
hardware: add enableRedistributalFirmware
This commit is contained in:
Jörg Thalheim 2017-05-09 15:57:49 +01:00 committed by GitHub
commit 5385a8e216
16 changed files with 51 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
nixos/modules/hardware/all-firmware.nix
View File

@ -2,7 +2,9 @@
with lib;
{
let
cfg = config.hardware;
in {
###### interface
@ -12,7 +14,16 @@ with lib;
default = false;
type = types.bool;
description = ''
Turn on this option if you want to enable all the firmware shipped in linux-firmware.
Turn on this option if you want to enable all the firmware.
'';
};
hardware.enableRedistributalFirmware = mkOption {
default = false;
type = types.bool;
description = ''
Turn on this option if you want to enable all the firmware with a license allowing redistribution.
(i.e. free firmware and <literal>firmware-linux-nonfree</literal>)
'';
};
@ -21,15 +32,27 @@ with lib;
###### implementation
config = mkIf config.hardware.enableAllFirmware {
hardware.firmware = with pkgs; [
firmwareLinuxNonfree
intel2200BGFirmware
rtl8723bs-firmware
rtl8192su-firmware
] ++ optionals config.nixpkgs.config.allowUnfree [
broadcom-bt-firmware
];
};
config = mkMerge [
(mkIf (cfg.enableAllFirmware || cfg.enableRedistributalFirmware) {
hardware.firmware = with pkgs; [
firmwareLinuxNonfree
intel2200BGFirmware
rtl8723bs-firmware
rtl8192su-firmware
];
})
(mkIf cfg.enableAllFirmware {
assertions = [{
assertion = !cfg.enableAllFirmware || (config.nixpkgs.config.allowUnfree or false);
message = ''
the list of hardware.enableAllFirmware contains non-redistributable licensed firmware files.
This requires nixpkgs.config.allowUnfree to be true.
An alternative is to use the hardware.enableRedistributalFirmware option.
'';
}];
hardware.firmware = with pkgs; [
broadcom-bt-firmware
];
})
];
}

2
nixos/modules/hardware/network/broadcom-43xx.nix
View File

@ -1,3 +1,3 @@
{
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
}

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

@ -1,3 +1,3 @@
{
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
}

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

@ -23,7 +23,7 @@
config = lib.mkIf config.networking.enableIntel2100BGFirmware {
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
};

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

@ -22,7 +22,7 @@
config = lib.mkIf config.networking.enableIntel3945ABGFirmware {
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
};

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

@ -1,3 +1,3 @@
{
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
}

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

@ -1,3 +1,3 @@
{
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
}

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

@ -1,3 +1,3 @@
{
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
}

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

@ -1,3 +1,3 @@
{
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
}

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

@ -1,3 +1,3 @@
{
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
}

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

@ -1,3 +1,3 @@
{
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
}

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

@ -20,7 +20,7 @@
###### implementation
config = lib.mkIf config.networking.enableRalinkFirmware {
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
};
}

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

@ -20,7 +20,7 @@
###### implementation
config = lib.mkIf config.networking.enableRTL8192cFirmware {
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
};
}

2
nixos/modules/hardware/video/radeon.nix
View File

@ -1,3 +1,3 @@
{
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
}

2
nixos/modules/installer/scan/not-detected.nix
View File

@ -5,5 +5,5 @@
with lib;
{
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
}

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

@ -50,7 +50,7 @@
];
# Include lots of firmware.
hardware.enableAllFirmware = true;
hardware.enableRedistributalFirmware = true;
imports =
[ ../hardware/network/zydas-zd1211.nix ];