Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/misc/vim-plugins/default.nix		2014-07-22 11:00:00 +02:00
..
amqp
apcupsd
beanstalkd
bird
computing/storm
dico
dict	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
diod
dns
elasticmq
etcd	add etcd package	2014-06-23 04:55:46 -04:00
fcgiwrap
felix
fingerd/bsd-fingerd
firebird
fleet	add fleet package	2014-06-23 05:20:41 -04:00
ftp/vsftpd
games/ghost-one
gpm
gpsd
http	Merge remote-tracking branch 'origin/master' into staging	2014-07-07 13:16:26 +02:00
icecast
identd/oidentd
irc
kippo
mail
mediatomb
memcached
monitoring	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
mpd	mpd: use pulseaudio in buildInputs if pulseaudioSupport is true not if zipSupport is true	2014-07-18 16:56:06 +02:00
news/leafnode
nosql	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
nsq	fetchbzr, fetchdarcs, fetchhg: use rev attr	2014-06-28 21:06:10 +02:00
openafs-client
pies
polipo	polipo: update to 1.1.1	2014-07-15 10:10:28 -04:00
portmap
prayer
pulseaudio
radius
restund	Add auto-updating meta for restund	2014-07-01 11:54:09 +04:00
rippled
rpcbind
sabnzbd
samba	samba: security-only updates 2.6.22 -> .24	2014-06-26 22:23:09 +02:00
search	elasticsearch: update to 1.2.2	2014-07-15 16:57:16 +01:00
serfdom	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
shellinabox
shishi
silc-server
sip
sql	mariadb: switch to a working download URL	2014-06-22 15:29:23 +02:00
squid
unfs3
varnish
x11/xorg
xinetd
xmpp