Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/stdenv/generic/default.nix		2014-11-06 10:16:39 +01:00
..
4store
apache-httpd	apache-httpd: Update to 2.2.29	2014-09-24 21:04:24 +02:00
apache-modules
couchdb	couchdb: update from 1.6.0 to 1.6.1	2014-10-06 22:03:42 +02:00
jboss
jetty	change md5sum to sha256sum for a few packages	2014-10-12 16:13:21 +02:00
joseki	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
lighttpd
mini-httpd	boostHeaders: regular boost package now only contains headers	2014-09-21 15:18:16 -07:00
myserver
nginx	Merge recent master into staging	2014-11-05 15:00:44 +01:00
nix-binary-cache
openresty	openresty: 1.7.4.1rc1 -> 1.7.4.1rc2	2014-09-20 08:21:11 -05:00
redstore
spawn-fcgi
thttpd	thttpd: update from 2.25b to 2.26, potentially fixes CVE-2013-0348	2014-10-08 20:23:26 +02:00
tomcat	tomcat: set meta.platforms	2014-10-27 18:44:25 +01:00
winstone
yaws