diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix index 0aaac8a14e49..1515779c9064 100644 --- a/nixos/modules/services/web-servers/unit/default.nix +++ b/nixos/modules/services/web-servers/unit/default.nix @@ -104,7 +104,7 @@ in { PIDFile = "/run/unit/unit.pid"; ExecStart = '' ${cfg.package}/bin/unitd --control 'unix:/run/unit/control.unit.sock' --pid '/run/unit/unit.pid' \ - --log '${cfg.logDir}/unit.log' --state '${cfg.stateDir}' --tmp '/tmp' \ + --log '${cfg.logDir}/unit.log' --statedir '${cfg.stateDir}' --tmpdir '/tmp' \ --user ${cfg.user} --group ${cfg.group} ''; ExecStop = '' diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 68ac3d7f2cd5..e1f41f2f6b6b 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -6,9 +6,9 @@ , withPerl534 ? false, perl534 , withPerl536 ? true, perl536 , withPerldevel ? false, perldevel -, withRuby_2_7 ? true, ruby_2_7 , withRuby_3_0 ? false, ruby_3_0 -, withRuby_3_1 ? false, ruby_3_1 +, withRuby_3_1 ? true, ruby_3_1 +, withRuby_3_2 ? false, ruby_3_2 , withSSL ? true, openssl ? null , withIPv6 ? true , withDebug ? false @@ -30,14 +30,14 @@ let php82-unit = php82.override phpConfig; in stdenv.mkDerivation rec { - version = "1.29.1"; + version = "1.30.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-Jk/rzPJq1FWWTe31Fa2Ah+MoWP5mh6XNSmiYIY42vvk="; + sha256 = "sha256-QLTzlW1OsU+gwaPKozLcBKfuTXbYg1ONqTVZpGX6mrQ="; }; nativeBuildInputs = [ which ]; @@ -49,9 +49,9 @@ in stdenv.mkDerivation rec { ++ 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 withRuby_3_2 ruby_3_2 ++ optional withSSL openssl; configureFlags = [ @@ -73,13 +73,9 @@ in stdenv.mkDerivation rec { ${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 + ${optionalString withRuby_3_2 "./configure ruby --module=ruby32 --ruby=${ruby_3_2}/bin/ruby"} ''; passthru.tests.unit-php = nixosTests.unit-php;