Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging ... Conflicts: pkgs/applications/editors/vim/macvim.nix		2014-11-04 14:30:43 +01:00
..
audio	Merge remote-tracking branch 'origin/master' into staging.	2014-11-02 16:15:53 +01:00
display-managers
editors	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
gis	qgis: disable parallel building	2014-10-13 15:32:50 +02:00
graphics	sxiv: use giflib 5.0	2014-10-22 18:42:35 +01:00
inferno
misc	iconv: remove usage on Linux in several packages	2014-11-03 12:58:54 +01:00
networking	iconv: remove usage on Linux in several packages	2014-11-03 12:58:54 +01:00
office	zotero: upgrade to fix xulrunner compatibility	2014-10-22 20:51:10 +02:00
science	iconv: remove usage on Linux in several packages	2014-11-03 12:58:54 +01:00
search
taxes
version-management	Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging	2014-11-04 14:30:43 +01:00
video	aegisub: do not force libiconv, use auto link flags	2014-11-03 12:58:54 +01:00
virtualization	add pulseaudio to virtualbox	2014-10-22 20:56:25 +02:00
window-managers	Better work-around for stumpwmContrib dependency	2014-10-29 15:17:06 +01:00