Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
4store
apache-httpd	apache 2_4 update, fixes some CVE's	2014-07-24 18:10:10 +02:00
apache-modules	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
couchdb	couchdb: update to 1.6.0	2014-07-05 09:18:42 +01:00
jboss
jetty	jetty61: update from 6.1.21 to 6.1.26	2013-12-18 18:18:33 +02:00
joseki	Set meta.hydraPlatforms instead of meta.platforms for some packages	2013-11-05 00:06:10 +01:00
lighttpd	lighttpd: add enableMysql option, to build 'mod_mysql_vhost'	2014-03-12 23:04:03 +01:00
mini-httpd
myserver	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
nginx	nginx: add echo module, fix aio on linux&freebsd	2014-06-16 22:43:58 +02:00
nix-binary-cache	Adding a minimal script set to serve store as a dynamical binary cache	2014-06-30 00:39:54 +04:00
redstore
spawn-fcgi	update spawn-fcgi to 1.6.4	2014-06-13 23:01:47 -04:00
thttpd	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
tomcat	axis2: add meta.description	2014-06-22 22:38:27 +02:00
winstone	New package: winstone 0.9.10, a Java Servlet container	2014-03-12 23:14:09 +01:00
yaws	yaws: Update to 1.98.	2013-11-12 20:04:26 +01:00