Joel Taylor 58971f7b14 add htop fork for darwin (close #2690) ... @vcunat made it a single conditional attribute. Conflicts (trivial): lib/maintainers.nix		2014-06-11 20:36:10 +02:00
..
applications	teamviewer: fix broken links (close #2901)	2014-06-11 20:19:03 +02:00
build-support	nix-prefetch-{bzr,hg,svn}: print fetched revision	2014-06-11 14:42:39 +02:00
data	Merge pull request #2741 from bergey/nafees	2014-05-28 08:37:29 +02:00
desktops	gvfs: add more supported protocols in gnome 3.12. Closes #2880	2014-06-10 12:25:31 +02:00
development	Merge #2711: add ansible-1.6.1	2014-06-11 20:29:55 +02:00
games	Merge pull request #2876 from auntieNeo/typespeed	2014-06-09 12:11:23 +04:00
misc	lilypond: cosmetic changes	2014-06-11 11:00:35 +02:00
os-specific	add htop fork for darwin (close #2690)	2014-06-11 20:36:10 +02:00
servers	mysql-connector-java: Bump to version 5.1.31	2014-06-09 19:11:33 +02:00
shells	fish: Fixed tab completion with sudo (close #2705)	2014-06-10 11:36:12 +02:00
stdenv	Change stdenv on darwin to not set NIX_ENFORCE_PURITY	2014-05-29 02:43:10 -05:00
test
tools	Merge #2711: add ansible-1.6.1	2014-06-11 20:29:55 +02:00
top-level	add htop fork for darwin (close #2690)	2014-06-11 20:36:10 +02:00