Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular ... Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix		2014-08-31 12:23:18 +02:00
..
4store	4store: fix build	2012-12-04 17:09:31 +04:00
apache-httpd	various packages fixed	2014-08-30 23:30:31 +02:00
apache-modules	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
couchdb	Fix many package descriptions	2014-08-24 22:31:37 +02:00
jboss	Fix many package descriptions	2014-08-24 22:31:37 +02:00
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	mini-httpd: update to version 1.4	2013-03-28 13:56:22 +01:00
myserver	Mark a bunch of packages as broken or not supported on Darwin	2014-08-08 17:59:02 +02:00
nginx	nginx: 1.6.0 -> 1.6.1	2014-08-17 06:35:40 -05: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
openresty	Fix various evaluation problems	2014-08-22 11:57:40 +02: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