Vladimír Čunát 00672dec8a Merge older staging ... This still causes some uncached rebuilds, but master(!) and staging move too fast forward rebuild-wise, so Hydra might never catch up. (There are also other occasional problems.) Therefore I merge at this point where the rebuild isn't that bad.		2017-05-26 15:45:43 +02:00
..
admin	lxd: 2.0.2 -> 2.12 (#25685)	2017-05-24 19:29:38 +01:00
archivers	zpaqd: Modernize derivation	2017-05-22 18:52:50 -04:00
audio	pnmixer: 0.7.1-rc1 -> 0.7.1	2017-05-26 15:32:53 +02:00
backup	bup: enable darwin build	2017-05-19 13:54:28 +02:00
bluetooth	blueman: use wrapGAppsHook	2017-05-11 20:34:51 +01:00
bootloaders/refind	refind: mark as broken	2017-03-14 15:36:35 +01:00
cd-dvd	unetbootin: set QT_X11_NO_MITSHM=1	2017-05-20 14:42:32 -04:00
compression	mozlz4a: init at 2015-07-24	2017-05-21 00:21:47 +02:00
filesystems	bcachefs-tools: 2017-05-08 -> 2017-05-12	2017-05-19 13:24:50 +01:00
graphics	wkhtmltopdf: 0.12.3.2 -> 0.12.4	2017-05-11 13:16:06 +08:00
inputmethods	ibus: 1.5.14 -> 1.5.16	2017-05-23 04:09:48 +02:00
misc	lf: 2017-02-04 -> 2017-05-15	2017-05-26 13:59:57 +02:00
networking	Merge older staging	2017-05-26 15:45:43 +02:00
package-management	nix: add "man" to meta.outputsToInstall	2017-05-25 06:34:31 -04:00
security	Merge older staging	2017-05-26 15:45:43 +02:00
system	socklog: disable shsgr test	2017-05-18 12:33:32 +02:00
text	Merge branch 'master' into staging	2017-05-24 03:24:06 +02:00
typesetting	Merge older staging	2017-05-26 15:45:43 +02:00
video	atomicparsley: 0.9.0 -> 0.9.6	2017-04-14 12:10:28 -07:00
virtualization	Merge pull request #23024 from phile314/cloud-init-update	2017-05-22 16:33:31 +02:00
X11	xpra: fix missed ffmpeg_3_2 reference	2017-04-30 16:58:33 -07:00