Vladimír Čunát 17ae1617dc Merge branch 'master' into x-updates ... Conflicts (systemd version is split on x-updates): pkgs/os-specific/linux/systemd/default.nix		2013-04-13 12:21:31 +02:00
..
admin	tigervnc: Drop dependency on libxcrypt	2013-01-28 17:19:03 +01:00
archivers	Adding ZPAQ archiver	2013-03-09 16:33:14 +04:00
backup	bup: update to version 0.25-rc1-107-g96c6fa2 and drop -Werror to fix the build	2013-04-07 23:33:19 +02:00
bluetooth	koffice, kbluetooth: remove from hydra	2013-03-02 09:21:11 +01:00
cd-dvd	cuetools metadata: license, maintainer, platforms	2013-03-31 21:43:53 -07:00
compression	lzip: build the binary with -O3 and assertions disabled	2013-03-13 15:13:40 +01:00
filesystems	openssh: Update to 6.2p1	2013-04-12 15:27:13 +02:00
graphics	Merge branch 'master' into x-updates	2013-04-04 21:43:40 +02:00
inputmethods/fcitx	add fcitx-4.2.7	2013-01-28 11:35:03 +08:00
misc	hdf5: download URL no longer available for 1.8.5, upgrade to 1.8.10	2013-04-11 10:54:31 +02:00
networking	openssh: Update to 6.2p1	2013-04-12 15:27:13 +02:00
package-management	nixUnstable: Bump	2013-03-26 16:00:47 +01:00
security	Remove the "proprietary" license	2013-04-12 14:37:50 +02:00
system	garden	2013-04-06 08:20:27 +02:00
text	pwgen, wgetpaste: set platforms	2013-03-29 18:32:58 +01:00
typesetting	Merge branch 'master' into x-updates	2013-04-04 21:43:40 +02:00
video	add swfmill-0.3.2	2013-02-05 11:36:18 +08:00
virtualization	ec2-ami-tools: Update to 1.4.0.9	2013-01-24 18:23:04 +01:00
X11	xpra: Use new ffmpeg attribute	2013-04-05 06:49:23 -04:00