diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-05 18:30:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-05 18:30:28 +0000 |
| commit | d9d6f71e43cbbf85c6bd5228ac7e3a772dd3b7c0 (patch) | |
| tree | de44060e2a3c09fd4a41d0d2fadb4fb40d19fb6c /pkgs/servers | |
| parent | 68272fcebd5a1459b13ab6bea916dbb2692495f3 (diff) | |
| parent | 16f5b7fc9264287d565ee432bf7cd5231f0fc3ff (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/jackett/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/zabbix/agent2.nix | 5 | ||||
| -rw-r--r-- | pkgs/servers/unpackerr/default.nix | 6 |
3 files changed, 10 insertions, 5 deletions
diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 600a5f67eb805..116fd9bae9274 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.18.225"; + version = "0.18.231"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-EvFu+v1Ltot5zuDWcuG8Z00NHjWjZTrI0JKv+rgVB7U="; + sha256 = "sha256-fl0M4Emstp21CrrE4Znzwi1XvTzx6TpPnNKYM65aoN4="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index 1deada4363740..98fafa4265d66 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -46,8 +46,13 @@ import ./versions.nix ({ version, sha256 }: ''; installPhase = '' + mkdir -p $out/sbin + install -Dm0644 src/go/conf/zabbix_agent2.conf $out/etc/zabbix_agent2.conf install -Dm0755 src/go/bin/zabbix_agent2 $out/bin/zabbix_agent2 + + # create a symlink which is compatible with the zabbixAgent module + ln -s $out/bin/zabbix_agent2 $out/sbin/zabbix_agentd ''; meta = with lib; { diff --git a/pkgs/servers/unpackerr/default.nix b/pkgs/servers/unpackerr/default.nix index 2e024010d4160..d9cde6b7ab5fe 100644 --- a/pkgs/servers/unpackerr/default.nix +++ b/pkgs/servers/unpackerr/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "unpackerr"; - version = "0.9.4"; + version = "0.9.6"; src = fetchFromGitHub { owner = "davidnewhall"; repo = "unpackerr"; rev = "v${version}"; - sha256 = "0ss12i8bclz1q9jgr54shvs8zgcs6jrwdm1vj9gvycyd5sx4717s"; + sha256 = "1jyqrfik6fy7d4lr1y0ryp4iz8yn898ksyxwaryvrhykznqivp0y"; }; - vendorSha256 = "1j79vmf0mkwkqrg5j6fm2b8y3a23y039kbiqkiwb56724bmd27dd"; + vendorSha256 = "0ilpg7xfll0c5lsv8zf4h3i72yabddkddih4d292hczyz9wi3j4z"; buildInputs = lib.optionals stdenv.isDarwin [ Cocoa WebKit ]; |