55 Commits

Author	SHA1	Message	Date
Eelco Dolstra	f8a034172a	Fix broken Conflicts options	2013-11-18 18:04:16 +01:00
Eelco Dolstra	408b8b5725	Add lots of missing option types	2013-10-30 18:47:43 +01:00
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
Eelco Dolstra	1408ac51a4	Add missing types	2013-10-28 22:45:56 +01:00
Eelco Dolstra	5c1f8cbc70	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00