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
..
amqp	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
audio	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
backup	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
databases	nixos/redis: log to syslog by default	2013-10-28 18:18:24 +01:00
games	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
hardware	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
logging	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
mail	Turn security.pam.services into an attribute set	2013-10-15 14:47:51 +02:00
misc	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
monitoring	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
network-filesystems	Turn security.pam.services into an attribute set	2013-10-15 14:47:51 +02:00
networking	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
printing	Turn security.pam.services into an attribute set	2013-10-15 14:47:51 +02:00
scheduling	Turn security.pam.services into an attribute set	2013-10-15 14:47:51 +02:00
search	Fix bogus mkOption types	2013-10-28 22:45:56 +01:00
security	fail2ban: Update to 0.8.10	2013-10-16 10:03:43 +02:00
system	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
torrent	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
ttys	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00
web-servers	zope2 service... indentation fix	2013-10-20 01:35:09 +02:00
x11	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00