Jan Malakhovski 7079e744d4 Merge branch 'master' into staging ... Resolved the following conflicts (by carefully applying patches from the both branches since the fork point): pkgs/development/libraries/epoxy/default.nix pkgs/development/libraries/gtk+/3.x.nix pkgs/development/python-modules/asgiref/default.nix pkgs/development/python-modules/daphne/default.nix pkgs/os-specific/linux/systemd/default.nix		2018-03-10 20:38:13 +00:00
..
apache-httpd	nixos: Move uses of stdenv.shell to runtimeShell.	2018-03-01 14:38:53 -05:00
jboss
lighttpd
nginx	nixos/nginx: validate config syntax in preStart (#24664)	2018-02-17 09:45:25 +00:00
phpfpm
varnish
caddy.nix
fcgiwrap.nix
mighttpd2.nix	nixos/mighttpd2: init	2018-01-16 21:04:09 +00:00
minio.nix
shellinabox.nix
tomcat.nix	nixos/tomcat: add types + proper systemd integration	2018-03-08 09:09:42 +00:00
traefik.nix	nixos/traefik: make group configurable for docker support (#34749)	2018-02-09 09:37:29 +00:00
uwsgi.nix
winstone.nix
zope2.nix