diff options
| author | Izorkin <izorkin@elven.pw> | 2023-05-13 11:14:13 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2023-05-13 16:55:47 +0300 |
| commit | baa5550162e9d32b39f9f42b4ae96f0525dedcff (patch) | |
| tree | a504b9646cd6a26c5b40ad24cbcbf5385f4fa21c | |
| parent | 1f68716877f8fde4c9f70ee2b237b3f405792b98 (diff) | |
| download | nixpkgs-baa5550162e9d32b39f9f42b4ae96f0525dedcff.tar nixpkgs-baa5550162e9d32b39f9f42b4ae96f0525dedcff.tar.gz nixpkgs-baa5550162e9d32b39f9f42b4ae96f0525dedcff.tar.bz2 nixpkgs-baa5550162e9d32b39f9f42b4ae96f0525dedcff.tar.lz nixpkgs-baa5550162e9d32b39f9f42b4ae96f0525dedcff.tar.xz nixpkgs-baa5550162e9d32b39f9f42b4ae96f0525dedcff.tar.zst nixpkgs-baa5550162e9d32b39f9f42b4ae96f0525dedcff.zip | |
unit: 1.29.1 -> 1.30.0
| -rw-r--r-- | nixos/modules/services/web-servers/unit/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/http/unit/default.nix | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix index 0aaac8a14e4..1515779c906 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 68ac3d7f2cd..840a6e67046 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -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 ]; @@ -78,10 +78,6 @@ in stdenv.mkDerivation rec { ${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; meta = { |