nixpkgs

Author	SHA1	Message	Date
Eelco Dolstra	862e3dd977	Substitute "types.uniq types.string" -> "types.str"	2013-10-30 14:57:42 +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	a3777ba4f9	Remove dependencies on the Nixpkgs location	2013-10-23 20:08:23 +02:00
Eelco Dolstra	5c1f8cbc70	Move all of NixOS to nixos/ in preparation of the repository merge	2013-10-10 13:28:20 +02:00