3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/servers/http
Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
..
4store 4store: fix build 2012-12-04 17:09:31 +04:00
apache-httpd Merge 'staging' into multiple-outputs 2014-08-23 16:04:53 +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 jboss: Update to 7.1.1.Final 2013-05-01 11:22:37 -04: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 nixpkgs: openresty 1.7.4.1rc1 2014-08-20 00:38:49 -05: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