diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/http/unit/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/servers/http/unit/default.nix | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix index fbb7768dcba..27f45fe6e47 100644 --- a/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/nixpkgs/pkgs/servers/http/unit/default.nix @@ -1,15 +1,14 @@ { stdenv, fetchFromGitHub, nixosTests, which , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses -, withPHP72 ? false, php72 , withPHP73 ? false, php73 , withPHP74 ? true, php74 -, withPerl528 ? false, perl528 -, withPerl530 ? true, perl530 +, withPerl530 ? false, perl530 +, withPerl532 ? true, perl532 , 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 @@ -27,19 +26,18 @@ let fpmSupport = false; }; - php72-unit = php72.override phpConfig; php73-unit = php73.override phpConfig; 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 ]; @@ -47,11 +45,10 @@ in stdenv.mkDerivation rec { buildInputs = [ ] ++ optional withPython2 python2 ++ optionals withPython3 [ python3 ncurses ] - ++ optional withPHP72 php72-unit ++ optional withPHP73 php73-unit ++ optional withPHP74 php74-unit - ++ optional withPerl528 perl528 ++ optional withPerl530 perl530 + ++ optional withPerl532 perl532 ++ optional withPerldevel perldevel ++ optional withRuby_2_5 ruby_2_5 ++ optional withRuby_2_6 ruby_2_6 @@ -68,18 +65,16 @@ in stdenv.mkDerivation rec { ++ optional withDebug "--debug"; # Optionally add the PHP derivations used so they can be addressed in the configs - usedPhp72 = optionals withPHP72 php72-unit; usedPhp73 = optionals withPHP73 php73-unit; usedPhp74 = optionals withPHP74 php74-unit; postConfigure = '' ${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"} - ${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"} ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} + ${optionalString withPerl532 "./configure perl --module=perl532 --perl=${perl532}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} ${optionalString withRuby_2_5 "./configure ruby --module=ruby25 --ruby=${ruby_2_5}/bin/ruby"} ${optionalString withRuby_2_6 "./configure ruby --module=ruby26 --ruby=${ruby_2_6}/bin/ruby"} |