Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix		2014-07-28 11:30:49 +02:00
..
apache-httpd	Merge remote-tracking branch 'origin/master' into staging	2014-07-14 17:04:55 +02:00
jboss
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
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 service to be a daemon, and run tomcat in script rather than preStart	2014-06-06 14:04:35 +02:00
winstone.nix
zope2.nix