Eelco Dolstra d5047faede Remove uses of the "merge" option attribute ...

It's redundant because you can (and should) specify an option type, or
an apply function.

2013-10-28 22:45:56 +01:00

..

cpu

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

network

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

video

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

all-firmware.nix

Move all of NixOS to nixos/ in preparation of the repository merge

2013-10-10 13:28:20 +02:00

pcmcia.nix

Remove uses of the "merge" option attribute

2013-10-28 22:45:56 +01:00