Merge remote-tracking branch 'upstream/master' into staging

2 files changed, 69 insertions, 2 deletions

diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 9503fd14907c..cdebbf739e6a 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -13,11 +13,11 @@ assert enableWebDAV -> sqlite != null;
 assert enableWebDAV -> libuuid != null;
 
 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.51";
+  name = "lighttpd-1.4.52";
 
   src = fetchurl {
     url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "10lw9vvivpvf4aw7ajayb2yyq4lp4dq3gq9llszjbw6icnrgvy9a";
+    sha256 = "0r57zp7050qxlwg41xqnqnhw3lrl34cg5zvfbqrwddrhqn8hkg17";
   };
 
   postPatch = ''
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
new file mode 100644
index 000000000000..38212885541f
--- /dev/null
+++ b/pkgs/servers/http/unit/default.nix
@@ -0,0 +1,67 @@
+{ stdenv, fetchurl
+, which
+, python
+, php71
+, php72
+, php73
+, perl
+, perldevel
+, ruby_2_3
+, ruby_2_4
+, ruby
+, withSSL ? true, openssl ? null
+, withIPv6 ? true
+, withDebug ? false
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "1.6";
+  name = "unit-${version}";
+
+  src = fetchurl {
+    url = "https://unit.nginx.org/download/${name}.tar.gz";
+    sha256 = "0lws5xpzkcmv0gc7vi8pgnymin02dq4gw0zb41jfzq0vbljxxl14";
+  };
+
+  buildInputs = [
+    which
+    python
+    php71
+    php72
+    php73
+    perl
+    perldevel
+    ruby_2_3
+    ruby_2_4
+    ruby
+  ] ++ optional withSSL openssl;
+
+  configureFlags = [
+    "--control=unix:/run/control.unit.sock"
+    "--pid=/run/unit.pid"
+  ] ++ optional withSSL     [ "--openssl" ]
+    ++ optional (!withIPv6) [ "--no-ipv6" ]
+    ++ optional withDebug   [ "--debug" ];
+
+  postConfigure = ''
+    ./configure python  --module=python    --config=${python}/bin/python-config  --lib-path=${python}/lib
+    ./configure php     --module=php71     --config=${php71.dev}/bin/php-config  --lib-path=${php71}/lib
+    ./configure php     --module=php72     --config=${php72.dev}/bin/php-config  --lib-path=${php72}/lib
+    ./configure php     --module=php73     --config=${php73.dev}/bin/php-config  --lib-path=${php73}/lib
+    ./configure perl    --module=perl      --perl=${perl}/bin/perl
+    ./configure perl    --module=perl529   --perl=${perldevel}/bin/perl
+    ./configure ruby    --module=ruby23    --ruby=${ruby_2_3}/bin/ruby
+    ./configure ruby    --module=ruby24    --ruby=${ruby_2_4}/bin/ruby
+    ./configure ruby    --module=ruby      --ruby=${ruby}/bin/ruby
+  '';
+
+  meta = {
+    description = "Dynamic web and application server, designed to run applications in multiple languages.";
+    homepage    = https://unit.nginx.org/;
+    license     = licenses.asl20;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ izorkin ];
+  };
+}