Vladimír Čunát 68430cf3d7 Merge branch master into x-updates ... Conflicts (trivial, minor update on master, major here): pkgs/development/libraries/mesa/default.nix		2013-11-16 20:32:44 +01:00
..
amqp	Add qpid v0.24	2013-10-30 17:24:02 +02:00
apcupsd	Some description fixes	2013-10-05 19:36:23 +02:00
bird	Adding bird-1.3.11	2013-09-15 11:39:24 +02:00
computing/storm	More description fixes	2013-10-06 12:01:38 +02:00
dico
dict
diod
dns/bind
elasticmq
evolution-data-server	Mark more packages as broken	2013-11-04 21:11:00 +01:00
felix
fingerd/bsd-fingerd
firebird
ftp/vsftpd	Clean up the vsftpd module a bit	2013-11-07 16:38:57 +01:00
games/ghost-one
gpm
gpsd
http	yaws: Update to 1.98.	2013-11-12 20:04:26 +01:00
icecast	More description fixes	2013-10-06 12:01:38 +02:00
identd/oidentd
irc/ircd-hybrid
mail	mailman: add version 2.1.16	2013-10-21 15:02:35 +02:00
mediatomb
memcached
monitoring	Don't build some packages on some platforms	2013-11-04 21:11:00 +01:00
mpd	Fix some more Hydra evaluation errors	2013-10-08 11:07:14 +02:00
nosql	Pin 1.3.1 to R15B03, riak does not work with R16	2013-09-17 20:41:06 +02:00
openafs-client	Mark more packages as broken	2013-11-04 21:11:00 +01:00
pies
polipo
portmap
prayer
pulseaudio	polkit, pulseaudio: Drop some Linux-specific dependencies	2013-10-06 00:21:28 +02:00
radius	Mark more packages as broken	2013-11-04 21:11:00 +01:00
restund
rpcbind
sabnzbd	More description fixes	2013-10-06 12:01:38 +02:00
samba	samba: bump 3.6.18 -> 3.6.20 (security fixes)	2013-11-12 20:29:45 +01:00
search/elasticsearch
shishi
silc-server
sip
sql	Merge pull request #686 from ocharles/postgres92	2013-11-07 02:53:37 -08:00
squid
unfs3
varnish	varnish: adding version 2.1.x	2013-11-02 01:45:27 +01:00
x11/xorg	Merge branch master into x-updates	2013-11-16 20:32:44 +01:00
xinetd
xmpp	ejabberd: updated to 2.1.13	2013-11-02 01:46:30 +01:00