Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates ... Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix		2013-05-08 13:46:46 +02:00
..
admin	tigervnc: Drop dependency on libxcrypt	2013-01-28 17:19:03 +01:00
archivers	xarchive: add gtk archiver	2013-05-05 22:03:50 +02:00
audio/pa-applet	pa-applet: add pulseaudio applet	2013-05-05 23:09:59 +02:00
backup	bup: enable Hydra builds	2013-04-26 12:51:46 +02:00
bluetooth	Remove KBluetooth. BlueDevil should be used instead.	2013-05-07 09:37:53 +03: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-17 18:26:28 +02:00
inputmethods/fcitx	add fcitx-4.2.7	2013-01-28 11:35:03 +08:00
misc	byobu 5.37 integration	2013-05-06 11:06:59 +00:00
networking	filegive: update to 0.5.2	2013-05-07 12:19:38 +02:00
package-management	checkinstall: Fix build on i686-linux	2013-05-03 13:43:47 +02:00
security	munge 0.5.10: New package, a credentials handler for clusters	2013-04-22 16:04:41 +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-17 18:26:28 +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	x11vnc: Properly hard-code the path to xdpyinfo	2013-05-01 20:49:56 -04:00