nixpkgs/pkgs/applications
Eelco Dolstra 10cb4a8cf2 Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix
2013-08-21 17:05:30 +02:00
..
audio Merge remote-tracking branch 'origin/master' into multiple-outputs 2013-08-21 17:05:30 +02:00
display-managers lightdm updates (merge #574) 2013-08-04 19:16:41 +02:00
editors emacs: Support building without GTK+ 2013-08-21 11:47:57 +02:00
graphics unmaintain several packages 2013-08-16 23:45:01 +02:00
misc fix eval 2013-08-21 01:23:40 +02:00
networking conkeror: upgrade to 1.0pre-20130817-1 2013-08-19 07:04:18 +02:00
office unmaintain several packages 2013-08-16 23:45:01 +02:00
science unmaintain several packages 2013-08-16 23:45:01 +02:00
search Adding doodle. 2013-04-22 20:57:14 +04:00
taxes aangifte2012: preload library which seems needed 2013-04-05 00:34:14 +02:00
version-management haskell-git-annex: update to version 4.20130815 2013-08-18 18:49:10 +02:00
video vlc: update to version 2.0.8 2013-08-19 22:03:54 +02:00
virtualization virtualbox: fix extension pack hash (must be base16) 2013-08-10 14:30:53 +02:00
window-managers unmaintain several packages 2013-08-16 23:45:01 +02:00