diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-30 17:37:45 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-30 18:47:43 +0100 |
| commit | 408b8b5725c3e6fff75aef772da248d3e95ff414 (patch) | |
| tree | 692e3b61dbbff85cc97e3becf13a1376dea04a92 /nixos/modules/hardware | |
| parent | d882e1966251880240599d3c1b31e060661506ee (diff) | |
| download | nixlib-408b8b5725c3e6fff75aef772da248d3e95ff414.tar nixlib-408b8b5725c3e6fff75aef772da248d3e95ff414.tar.gz nixlib-408b8b5725c3e6fff75aef772da248d3e95ff414.tar.bz2 nixlib-408b8b5725c3e6fff75aef772da248d3e95ff414.tar.lz nixlib-408b8b5725c3e6fff75aef772da248d3e95ff414.tar.xz nixlib-408b8b5725c3e6fff75aef772da248d3e95ff414.tar.zst nixlib-408b8b5725c3e6fff75aef772da248d3e95ff414.zip | |
Add lots of missing option types
Diffstat (limited to 'nixos/modules/hardware')
| -rw-r--r-- | nixos/modules/hardware/all-firmware.nix | 10 | ||||
| -rw-r--r-- | nixos/modules/hardware/pcmcia.nix | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 16b6a862593a..027dd827b4dd 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -1,4 +1,6 @@ -{pkgs, config, ...}: +{ config, pkgs, ... }: + +with pkgs.lib; { @@ -6,9 +8,9 @@ options = { - hardware.enableAllFirmware = pkgs.lib.mkOption { + hardware.enableAllFirmware = mkOption { default = false; - type = pkgs.lib.types.bool; + type = types.bool; description = '' Turn on this option if you want to enable all the firmware shipped with Debian/Ubuntu. ''; @@ -19,7 +21,7 @@ ###### implementation - config = pkgs.lib.mkIf config.hardware.enableAllFirmware { + config = mkIf config.hardware.enableAllFirmware { hardware.firmware = [ "${pkgs.firmwareLinuxNonfree}/lib/firmware" ]; }; diff --git a/nixos/modules/hardware/pcmcia.nix b/nixos/modules/hardware/pcmcia.nix index dea04ac753c6..206846567505 100644 --- a/nixos/modules/hardware/pcmcia.nix +++ b/nixos/modules/hardware/pcmcia.nix @@ -36,7 +36,7 @@ in config = mkOption { default = null; description = '' - Path to the configuration file which map the memory, irq + Path to the configuration file which maps the memory, IRQs and ports used by the PCMCIA hardware. ''; }; |