diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-05-30 20:14:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-30 20:14:24 +0100 |
| commit | 78775bacf0744d111fcff3db016f10c7771c9c05 (patch) | |
| tree | 2caf021a88eaf9a462a20a660b166282822359b8 /pkgs | |
| parent | 639d53bbef6ea402c661a724e33e7d6fdb737e43 (diff) | |
| parent | ea956bb53befe84d6e5f432ede6dea49dff3390b (diff) | |
| download | nixlib-78775bacf0744d111fcff3db016f10c7771c9c05.tar nixlib-78775bacf0744d111fcff3db016f10c7771c9c05.tar.gz nixlib-78775bacf0744d111fcff3db016f10c7771c9c05.tar.bz2 nixlib-78775bacf0744d111fcff3db016f10c7771c9c05.tar.lz nixlib-78775bacf0744d111fcff3db016f10c7771c9c05.tar.xz nixlib-78775bacf0744d111fcff3db016f10c7771c9c05.tar.zst nixlib-78775bacf0744d111fcff3db016f10c7771c9c05.zip | |
Merge pull request #89222 from Izorkin/nginx-unit
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/http/unit/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index c161566d329f..7bd3451e771f 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -32,14 +32,14 @@ let php74-unit = php74.override phpConfig; in stdenv.mkDerivation rec { - version = "1.17.0"; + version = "1.18.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = version; - sha256 = "1q3659vw8rxv4fk7ljkjav8ga72sb3arljfxcqw8b080f9hvi7hh"; + sha256 = "0r2l3ra63qjjbpjzrmx75jp9fvz83yis4j3qxqdnmxm77psykwy8"; }; nativeBuildInputs = [ which ]; @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP72 php72-unit ++ optional withPHP73 php73-unit - ++ optional withPHP73 php74-unit + ++ optional withPHP74 php74-unit ++ optional withPerl528 perl528 ++ optional withPerl530 perl530 ++ optional withPerldevel perldevel @@ -68,8 +68,8 @@ in stdenv.mkDerivation rec { ++ optional withDebug "--debug"; postConfigure = '' - ${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"} - ${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"} + ${optionalString withPython2 "./configure python --module=python2 --config=python2-config --lib-path=${python2}/lib"} + ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.unwrapped.dev}/bin/php-config --lib-path=${php72-unit}/lib"} ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"} ${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"} |