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
doc	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
lib	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
maintainers/scripts	Fix references to pkgs/lib	2013-10-10 13:28:22 +02:00
nixos	Remove uses of the "merge" option attribute	2013-10-28 22:45:56 +01:00
pkgs	miro: New package, version 6.0.	2013-10-28 20:48:50 +01:00
.gitignore	Merge .gitignore files	2013-10-10 13:28:22 +02:00
.version	Unify the Nixpkgs and NixOS version numbers	2013-10-10 13:28:22 +02:00
COPYING	* Applying an MIT-style license to Nixpkgs.	2006-04-25 16:50:34 +00:00
default.nix	* For convenience, provide a top-level Nix expression that simply	2007-04-26 14:32:57 +00:00