Shea Levy f4c989ede4 Merge branch 'master' of git://github.com/hrdinka/nixpkgs ... conky: add config options		2014-03-20 20:14:14 -04:00
..
darwin	set all licenses to be attributes (and wait for Nix 1.7)	2014-03-12 21:20:43 +01:00
gnu	More renames	2012-12-28 19:42:10 +01:00
linux	Merge branch 'master' of git://github.com/hrdinka/nixpkgs	2014-03-20 20:14:14 -04:00
windows	windows/cygwin-setup: Drop meta.platforms attr.	2014-03-04 00:52:39 +01:00