diff options
| author | Arie Middelkoop <amiddelk@gmail.com> | 2012-01-14 09:30:24 +0000 |
|---|---|---|
| committer | Arie Middelkoop <amiddelk@gmail.com> | 2012-01-14 09:30:24 +0000 |
| commit | 4d26262878fc03336a85f2e1523efc345baa3c5f (patch) | |
| tree | 35f82fe6abc366df6faf531961b8b8d9cc16a01b /modules/module-list.nix | |
| parent | 50d7a38c8248a6fa6df95520a2645634b4c34fb9 (diff) | |
| download | nixpkgs-4d26262878fc03336a85f2e1523efc345baa3c5f.tar nixpkgs-4d26262878fc03336a85f2e1523efc345baa3c5f.tar.gz nixpkgs-4d26262878fc03336a85f2e1523efc345baa3c5f.tar.bz2 nixpkgs-4d26262878fc03336a85f2e1523efc345baa3c5f.tar.lz nixpkgs-4d26262878fc03336a85f2e1523efc345baa3c5f.tar.xz nixpkgs-4d26262878fc03336a85f2e1523efc345baa3c5f.tar.zst nixpkgs-4d26262878fc03336a85f2e1523efc345baa3c5f.zip | |
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. svn path=/nixos/trunk/; revision=31527
Diffstat (limited to 'modules/module-list.nix')
| -rw-r--r-- | modules/module-list.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/module-list.nix b/modules/module-list.nix index 6781e1b7a9e..398a902b638 100644 --- a/modules/module-list.nix +++ b/modules/module-list.nix @@ -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 |