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

JBoss AS: list known vulnerability

2017-03-13 18:45:19 +01:00

lighttpd

nixos/lighttpd: update allKnownModules list

2017-12-15 07:47:45 +01:00

nginx

nixos/nginx: validate config syntax in preStart (#24664)

2018-02-17 09:45:25 +00:00

phpfpm

phpfpm service: allow netlink sockets for sendmail

2017-08-29 00:41:31 +02:00

varnish

nixos/varnish: it does not matter where to check syntax, only when

2017-12-09 08:29:44 +00:00

caddy.nix

nixos/caddy: improve documentation

2017-08-24 13:39:06 -04:00

fcgiwrap.nix

fcgiwrap module: use enum

2016-11-04 13:04:52 +09:00

mighttpd2.nix

nixos/mighttpd2: init

2018-01-16 21:04:09 +00:00

minio.nix

minio service: add additional config options

2017-07-09 15:19:50 +02:00

shellinabox.nix

shellinabox service: intial implementation

2015-07-04 21:18:13 +12:00

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

uwsgi service: fix for new pythonPackages

2016-12-08 21:03:41 +03:00

winstone.nix

winstone module: optionSet -> submodule

2016-09-13 12:53:12 +09:00

zope2.nix

zope2 module: instance option loaOf -> attrsOf

2016-11-16 16:34:00 +09:00