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

..

apache-httpd

Merge remote-tracking branch 'origin/master' into staging.

2014-08-04 16:51:47 +02:00

jboss

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

lighttpd

nixos/lighttpd: improve sub-service option types (cgit, gitweb)

2014-07-23 22:18:37 +02:00

nginx

nixos/nginx: fix group and stateDir permissions

2014-06-16 22:43:58 +02:00

varnish

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

fcgiwrap.nix

fcgiwrap: new package

2014-06-04 10:20:19 +02:00

phpfpm.nix

phpfpm: add option for setting php.ini file

2014-06-16 22:44:18 +02:00

tomcat.nix

tomcat: Fix evaluation after e27dcff.

2014-08-03 16:09:45 +02:00

winstone.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00

zope2.nix

Rewrite ‘with pkgs.lib’ -> ‘with lib’

2014-04-14 16:26:48 +02:00