Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv		2016-05-30 19:39:34 +00:00
..
4store	4store: 1.1.5 -> 1.1.6 (convert from builderDefsPackage)	2016-05-08 18:29:40 +01:00
apache-httpd	treewide: Make explicit that 'dev' output of zlib is used	2016-05-19 10:04:38 +02:00
apache-modules	treewide: Make explicit that 'dev' output of apacheHttpd is used	2016-05-19 10:00:23 +02:00
apt-cacher-ng	apt-cacher-ng: disable on OSX	2016-04-07 11:57:12 -05:00
couchdb	couchdb: add platform, remove maintainer that was added accidentally, fixes #12502	2016-01-24 14:39:47 +01:00
darkhttpd	darkhttpd: init at 1.11	2015-11-19 14:51:14 +01:00
gatling	gatling: fix meta evaluation	2015-11-11 08:31:56 +01:00
jboss
jetty	jetty: 5.1.4 -> 6.1.4	2015-09-29 10:41:26 +02:00
lighttpd	lighttpd: 1.4.37 -> 1.4.39	2016-05-03 16:15:20 +02:00
micro-httpd
mini-httpd	Bring my stdenv.lib.maintainers user name in line with my github nick.	2016-05-16 22:49:55 +02:00
myserver
nginx	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-05-30 19:39:34 +00:00
nix-binary-cache	nix-binary-cache: take into account Nix split (mulitple-outputs)	2016-04-22 00:57:43 +02:00
openresty	libxml2,libxslt: split into multiple outputs	2015-10-05 13:44:16 +02:00
pshs	pshs: 0.2.6 -> 0.3	2016-01-17 22:44:48 -05:00
redstore
spawn-fcgi
thttpd	thttpd: 2.26 -> 2.27	2016-04-09 19:28:50 +02:00
tomcat	tomcat: 6.0.44 -> 6.0.45, 7.0.62 -> 7.0.68, 8.0.23 -> 8.0.32	2016-03-07 03:34:44 +01:00
webfs	webfs: fix mime types	2015-11-28 14:24:21 +00:00
winstone
yaws	yaws: update from 1.99 to 2.0	2015-08-05 10:29:47 +02:00