Vladimír Čunát 77da5efc78 merge the rest of multiple-outputs ... Conflicts: pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken) pkgs/development/tools/misc/patchelf/default.nix (easy) pkgs/stdenv/generic/setup.sh (previous merge taken)		2014-08-25 10:41:49 +02:00
..
audio	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
display-managers	freetype: major update, including some CVE security	2014-06-17 09:00:29 +02:00
editors	merge #3428: nano: bump and add system-wide config	2014-08-14 23:51:29 +02:00
graphics	Disable Hydra builds for broken Haskell packages.	2014-08-20 20:26:57 +02:00
ike	ike: use stdenv.lib.licenses.sleepycat	2014-03-24 19:58:36 -05:00
inferno	Add missing 's' in remaining meta.maintainer(s) attrs	2014-07-22 23:49:21 +02:00
misc	Slic3r: Bump to 1.1.7.	2014-08-20 16:27:47 +02:00
networking	Merge recent master into staging	2014-08-21 15:09:31 +02:00
office	zotero: add check to detect xul version breakages	2014-08-15 02:03:52 +02:00
science	Merge 'staging'	2014-08-24 10:50:22 +02:00
search	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
taxes	Add aangifte-2013	2014-03-01 16:54:16 +01:00
version-management	subversion+serf: security update to fix CVE-2014-3504	2014-08-21 15:13:19 +02:00
video	mplayer: Add GNU FriBiDi support.	2014-08-19 16:24:58 +02:00
virtualization	gobject-introspection: refer to shlibs with absolute paths in typelibs	2014-08-14 23:16:51 +02:00
window-managers	Remove unnecessary dependencies and centralize version string.	2014-08-14 21:01:20 -04:00