Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. ... Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix		2014-09-02 12:31:03 +02:00
..
amqp	rabbitmq-server: updated to 3.3.5	2014-08-28 17:36:13 +02:00
apcupsd
beanstalkd
bird
computing/storm
consul
dico	Fix many package descriptions	2014-08-24 22:31:37 +02:00
dict
diod	diod: Update from 1.0.21 to 1.0.22	2014-08-20 16:10:20 +02:00
dns	Fix many package descriptions	2014-08-24 22:31:37 +02:00
elasticmq
etcd
fcgiwrap
felix	Fix many package descriptions	2014-08-24 22:31:37 +02:00
fingerd/bsd-fingerd
firebird	Fix many package descriptions	2014-08-24 22:31:37 +02:00
fleet
ftp/vsftpd
games/ghost-one
gpm
gpsd
http	Merge pull request #3704 from sfultong/upstream-master	2014-09-02 02:09:18 +04:00
icecast
identd/oidentd
irc
kippo
mail	Add mlmmj package and nixos module.	2014-08-23 12:30:45 +04:00
mediatomb
memcached
misc/taskserver	Add taskserver package (close #3269)	2014-08-15 00:28:41 +02:00
monitoring	munin: fix test	2014-08-31 16:54:09 +02:00
mpd
news/leafnode	leafnode: mark as broken for ZHF	2014-08-21 17:10:37 +02:00
nosql	mongodb: add offline as maintainer	2014-08-29 17:56:07 +02:00
nsq
openafs-client
pies	Fix many package descriptions	2014-08-24 22:31:37 +02:00
polipo
portmap
prayer
pulseaudio	Fix many package descriptions	2014-08-24 22:31:37 +02:00
radius
restund
rippled
rpcbind
s6	s6: new package	2014-08-22 23:42:13 -05:00
sabnzbd
samba
search	elasticsearch: fix darwin, needs getopt	2014-08-16 12:55:23 +02:00
serfdom
shellinabox
shishi	Fix many package descriptions	2014-08-24 22:31:37 +02:00
silc-server
sip
sql	mariadb: Patch to compile on OS X.	2014-08-30 14:41:51 -05:00
squid
uhub	uhub: initial package for version 0.4.1	2014-09-01 10:53:19 +04:00
unfs3
unifi
varnish
x11	Merge recent master into staging	2014-08-30 10:04:02 +02:00
xinetd
xmpp
zookeeper	Zookeeper	2014-08-27 13:01:30 +02:00