Author: amiddelk
Date: Sat Jan 14 09:30:24 2012
New Revision: 31527
URL: https://nixos.org/websvn/nix/?rev=31527&sc=1
Log:
Some renaming as was mentioned on the mailinglist.
Also, removed the firmware-free option because that firmware is already in the
kernel package and thus causing collisions otherwise.
Added:
nixos/trunk/modules/hardware/all-firmware.nix
- copied, changed from r31524,
nixos/trunk/modules/hardware/firmware-nonfree.nix
Deleted:
nixos/trunk/modules/hardware/firmware-free.nix
nixos/trunk/modules/hardware/firmware-nonfree.nix
Modified:
nixos/trunk/modules/module-list.nix
Copied and modified: nixos/trunk/modules/hardware/all-firmware.nix (from
r31524, nixos/trunk/modules/hardware/firmware-nonfree.nix)
==============================================================================
--- nixos/trunk/modules/hardware/firmware-nonfree.nix Fri Jan 13 22:25:16
2012 (r31524, copy source)
+++ nixos/trunk/modules/hardware/all-firmware.nix Sat Jan 14 09:30:24
2012 (r31527)
@@ -6,11 +6,11 @@
options = {
- hardware.enableFirmwareLinuxNonfree = pkgs.lib.mkOption {
+ hardware.enableAllFirmware = pkgs.lib.mkOption {
default = false;
type = pkgs.lib.types.bool;
description = ''
- Turn on this option if you want the set of firmware of the non-free
package.
+ Turn on this option if you want to enable all the firmware shipped
with Debian/Ubuntu.
'';
};
@@ -19,7 +19,7 @@
###### implementation
- config = pkgs.lib.mkIf config.hardware.enableFirmwareLinuxNonfree {
+ config = pkgs.lib.mkIf config.hardware.enableAllFirmware {
hardware.firmware = [ pkgs.firmwareLinuxNonfree ];
};
Modified: nixos/trunk/modules/module-list.nix
==============================================================================
--- nixos/trunk/modules/module-list.nix Fri Jan 13 23:35:07 2012 (r31526)
+++ nixos/trunk/modules/module-list.nix Sat Jan 14 09:30:24 2012 (r31527)
@@ -20,8 +20,7 @@
./hardware/network/rt73.nix
./hardware/network/rtl8192c.nix
./hardware/pcmcia.nix
- ./hardware/firmware-nonfree.nix
- ./hardware/firmware-free.nix
+ ./hardware/all-firmware.nix
./installer/generations-dir/generations-dir.nix
./installer/grub/grub.nix
./installer/init-script/init-script.nix
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
