Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates ... Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.		2013-02-21 11:13:30 -05:00
..
amqp/rabbitmq-server
dico
dict
dns/bind
elasticmq
evolution-data-server
felix
fingerd/bsd-fingerd
firebird
ftp/vsftpd	vsftpd: fixing build in x86_64/i686	2013-01-03 19:52:14 +01:00
games/ghost-one
gpm	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
gpsd	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
http	Add yaws, an Erlang HTTP server	2013-02-20 22:34:55 +01:00
icecast
identd/oidentd
irc/ircd-hybrid
mail	petidomo: update to version 4.3	2013-02-11 14:38:02 +01:00
mediatomb
memcached	Update memcached to 1.4.15	2012-12-01 21:09:55 +01:00
monitoring	Update zabbix2 to 2.0.4	2013-01-24 11:51:57 +01:00
mpd	mpd: Update to 0.17.3	2013-01-18 12:01:14 +01:00
nosql	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-01-22 23:23:53 +01:00
openafs-client
pies
polipo
portmap	Remove duplicate tcp-wrappers package	2012-11-29 15:26:13 +01:00
prayer	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
pulseaudio
radius
restund
rpcbind
sabnzbd
samba	samba, imagemagick: Add missing meta info	2013-01-06 22:31:16 +01:00
shishi	shishi: Fix build	2013-01-28 17:19:01 +01:00
sip
sql	postgresql: Update to latest versions	2013-02-07 16:37:12 +01:00
squid
unfs3	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
x11/xorg	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
xinetd
xmpp