about summary refs log tree commit diff
path: root/nixpkgs/pkgs/servers/http/unit/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/servers/http/unit/default.nix')
-rw-r--r--nixpkgs/pkgs/servers/http/unit/default.nix39
1 files changed, 23 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/servers/http/unit/default.nix b/nixpkgs/pkgs/servers/http/unit/default.nix
index e6fcaaca4bcf..c1174383c95f 100644
--- a/nixpkgs/pkgs/servers/http/unit/default.nix
+++ b/nixpkgs/pkgs/servers/http/unit/default.nix
@@ -1,13 +1,14 @@
 { lib, stdenv, fetchFromGitHub, nixosTests, which
 , pcre2
-, withPython2 ? false, python2
 , withPython3 ? true, python3, ncurses
-, withPHP74 ? false, php74
-, withPHP80 ? true, php80
-, withPerl532 ? false, perl532
-, withPerl534 ? true, perl534
+, withPHP80 ? false, php80
+, withPHP81 ? true, php81
+, withPerl534 ? false, perl534
+, withPerl536 ? true, perl536
 , withPerldevel ? false, perldevel
-, withRuby_2_7 ? false, ruby_2_7
+, withRuby_2_7 ? true, ruby_2_7
+, withRuby_3_0 ? false, ruby_3_0
+, withRuby_3_1 ? false, ruby_3_1
 , withSSL ? true, openssl ? null
 , withIPv6 ? true
 , withDebug ? false
@@ -25,31 +26,32 @@ let
     fpmSupport = false;
   };
 
-  php74-unit = php74.override phpConfig;
   php80-unit = php80.override phpConfig;
+  php81-unit = php81.override phpConfig;
 
 in stdenv.mkDerivation rec {
-  version = "1.26.1";
+  version = "1.27.0";
   pname = "unit";
 
   src = fetchFromGitHub {
     owner = "nginx";
     repo = pname;
     rev = version;
-    sha256 = "sha256-rTT7EJSHepGOwNXVqlOBOhZayZQXyNo3B2Oa1oLf2FI=";
+    sha256 = "sha256-H/WIrCyocEO/HZfVMyI9IwD565JsUIzC8n1qUYmCvWc=";
   };
 
   nativeBuildInputs = [ which ];
 
   buildInputs = [ pcre2.dev ]
-    ++ optional withPython2 python2
     ++ optionals withPython3 [ python3 ncurses ]
-    ++ optional withPHP74 php74-unit
     ++ optional withPHP80 php80-unit
-    ++ optional withPerl532 perl532
+    ++ optional withPHP81 php81-unit
     ++ optional withPerl534 perl534
+    ++ optional withPerl536 perl536
     ++ optional withPerldevel perldevel
     ++ optional withRuby_2_7 ruby_2_7
+    ++ optional withRuby_3_0 ruby_3_0
+    ++ optional withRuby_3_1 ruby_3_1
     ++ optional withSSL openssl;
 
   configureFlags = [
@@ -62,18 +64,23 @@ in stdenv.mkDerivation rec {
     ++ optional withDebug   "--debug";
 
   # Optionally add the PHP derivations used so they can be addressed in the configs
-  usedPhp74 = optionals withPHP74 php74-unit;
   usedPhp80 = optionals withPHP80 php80-unit;
+  usedPhp81 = optionals withPHP81 php81-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 withPHP74      "./configure php    --module=php74    --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"}
     ${optionalString withPHP80      "./configure php    --module=php80    --config=${php80-unit.unwrapped.dev}/bin/php-config --lib-path=${php80-unit}/lib"}
-    ${optionalString withPerl532    "./configure perl   --module=perl532  --perl=${perl532}/bin/perl"}
+    ${optionalString withPHP81      "./configure php    --module=php81    --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"}
     ${optionalString withPerl534    "./configure perl   --module=perl534  --perl=${perl534}/bin/perl"}
+    ${optionalString withPerl536    "./configure perl   --module=perl536  --perl=${perl536}/bin/perl"}
     ${optionalString withPerldevel  "./configure perl   --module=perldev  --perl=${perldevel}/bin/perl"}
     ${optionalString withRuby_2_7   "./configure ruby   --module=ruby27   --ruby=${ruby_2_7}/bin/ruby"}
+    ${optionalString withRuby_3_0   "./configure ruby   --module=ruby30   --ruby=${ruby_3_0}/bin/ruby"}
+    ${optionalString withRuby_3_1   "./configure ruby   --module=ruby31   --ruby=${ruby_3_1}/bin/ruby"}
+  '';
+
+  postInstall = ''
+    rmdir $out/state
   '';
 
   passthru.tests.unit-php = nixosTests.unit-php;