diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-08-24 13:42:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 13:42:11 +0100 |
| commit | 4c9ad3ca793e2418a725f2c227108b71db109913 (patch) | |
| tree | 3dfb818a33da2cf65515970586a1723cb8792cb3 /pkgs/servers/http | |
| parent | 5c70c5eeaa275aae90e1d3e5b63a6fdcf29bc850 (diff) | |
| parent | e207de63f4f4a8f377eed1f522dc872f338eb26c (diff) | |
Merge branch 'master' into nginx-update
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 1 | ||||
| -rw-r--r-- | pkgs/servers/http/unit/default.nix | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 867723018d34..4b63b589ea95 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { prePatch = '' sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|' - sed -i support/apachectl.in -e 's|$HTTPD -t|$HTTPD -t -f /etc/httpd/httpd.conf|' ''; # Required for ‘pthread_cancel’. diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 913ed201f48e..2f73a5d92439 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -8,7 +8,7 @@ , withPerldevel ? false, perldevel , withRuby_2_5 ? false, ruby_2_5 , withRuby_2_6 ? true, ruby_2_6 -, withRuby_2_7 ? true, ruby_2_7 +, withRuby_2_7 ? false, ruby_2_7 , withSSL ? true, openssl ? null , withIPv6 ? true , withDebug ? false @@ -30,14 +30,14 @@ let php74-unit = php74.override phpConfig; in stdenv.mkDerivation rec { - version = "1.18.0"; + version = "1.19.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = version; - sha256 = "0r2l3ra63qjjbpjzrmx75jp9fvz83yis4j3qxqdnmxm77psykwy8"; + sha256 = "0k3q42q198sb0w6hyyymw92dbhz67axn6w6vnzr0d883xw3sva7k"; }; nativeBuildInputs = [ which ]; |