From c15722eec0698c9e3cdb836b6cd3c7e270c57045 Mon Sep 17 00:00:00 2001 From: mc-fucker Date: Tue, 2 Apr 2024 18:01:05 +0200 Subject: [PATCH] changed zabbix agent2 to support current nix build --- packages/zabbix/agent2.nix | 8 +++----- packages/zabbix/versions.nix | 21 ++++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/zabbix/agent2.nix b/packages/zabbix/agent2.nix index 39e93f3..374a137 100644 --- a/packages/zabbix/agent2.nix +++ b/packages/zabbix/agent2.nix @@ -1,20 +1,18 @@ { lib, buildGoModule, fetchurl, autoreconfHook, pkg-config, libiconv, openssl, pcre, zlib }: -import ./versions.nix ({ version, sha256 }: +import ./versions.nix ({ version, hash, vendorHash ? throw "unsupported version ${version} for zabbix-agent2", ... }: buildGoModule { pname = "zabbix-agent2"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; modRoot = "src/go"; - #vendorSha256 = "1417qi061xc4m55z0vz420fr7qpi24kw5yj9wq7iic92smakgkjn"; - #vendorSha256 = "sha256-W95Z9pIhd5MQJAGn94kiVbQVFkmvjGPWfMx4JyJ2/EU="; - vendorSha256 = null; + inherit vendorHash; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libiconv openssl pcre zlib ]; diff --git a/packages/zabbix/versions.nix b/packages/zabbix/versions.nix index bb99e0f..d8afb02 100644 --- a/packages/zabbix/versions.nix +++ b/packages/zabbix/versions.nix @@ -1,16 +1,19 @@ generic: { latest = generic { - version = "6.4.10"; - sha256 = "sha256-2rrRr1LsXztlyj1QAeV4LNcx0QQ5SnGDvYHfrl1qvSU="; + version = "6.4.12"; + hash = "sha256-tk88/GyjlR1JsCSgktCyBVXdFTqfkMJ1TK7WYAuqE6g="; + vendorHash = null; + }; + + v60 = generic { + version = "6.0.26"; + hash = "sha256-MIOKe5hqfDecB1oWZKzbFmJCsQLuAGtp21l2WxxVG+g="; + vendorHash = null; }; v50 = generic { - version = "5.0.19"; - sha256 = "sha256-esa7DczdaWiG8Ru9py8HlOhvhkjV8IQjMwuiJ6F5c6E="; - }; - - v40 = generic { - version = "4.0.37"; - sha256 = "sha256-Wuexl8I2zA63jyTRDe8bMSP++imwSOxc4LEdUnH8jps="; + version = "5.0.41"; + hash = "sha256-pPvw0lPoK1IpsXc5c8Qu9zFhx2oHJz2bwiX80vrYa58="; + vendorHash = "sha256-qLDoNnEFiSrWXbLtYlmQaqY8Rv6JaG8WbMYBlry5Evc="; }; }