Eelco Dolstra 10cb4a8cf2 Merge remote-tracking branch 'origin/master' into multiple-outputs ... Conflicts: pkgs/development/libraries/gtk+/2.x.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libsndfile/default.nix pkgs/misc/cups/default.nix pkgs/top-level/all-packages.nix		2013-08-21 17:05:30 +02:00
..
4store	4store: fix build	2012-12-04 17:09:31 +04:00
apache-httpd	Merge remote-tracking branch 'origin/master' into multiple-outputs	2013-08-21 17:05:30 +02:00
apache-modules	Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.	2013-06-07 03:15:45 +03:00
couchdb	Update CouchDB	2012-12-04 10:17:06 +04:00
jboss	jboss: Update to 7.1.1.Final	2013-05-01 11:22:37 -04:00
jetty
joseki	Fix unneeded /bin/sh reference	2012-11-10 15:03:40 +04:00
lighttpd	Fix maintainers attribute	2013-05-21 09:20:00 +02:00
mini-httpd	mini-httpd: update to version 1.4	2013-03-28 13:56:22 +01:00
myserver	unmaintain several packages	2013-08-16 23:45:01 +02:00
nginx	Update nginx	2013-07-11 10:28:52 +04:00
redstore
thttpd	thttpd: New package, version 2.25b.	2013-07-30 05:59:59 +02:00
tomcat
yaws	Add yaws, an Erlang HTTP server	2013-02-20 22:34:55 +01:00