From a4fc9696dafc7f3b67b34979195c561d7ab6b9f2 Mon Sep 17 00:00:00 2001 From: schnusch Date: Thu, 11 Nov 2021 21:29:43 +0100 Subject: [PATCH] zabbix: move vendorSha256 to versions.nix --- pkgs/servers/monitoring/zabbix/agent.nix | 2 +- pkgs/servers/monitoring/zabbix/agent2.nix | 7 ++----- pkgs/servers/monitoring/zabbix/proxy.nix | 2 +- pkgs/servers/monitoring/zabbix/server.nix | 2 +- pkgs/servers/monitoring/zabbix/web.nix | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index f11af1809981..4aaeb9f103d6 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, libiconv, openssl, pcre }: -import ./versions.nix ({ version, sha256 }: +import ./versions.nix ({ version, sha256, ... }: stdenv.mkDerivation { pname = "zabbix-agent"; inherit version; diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index b82ddd3206be..0687e0eaf129 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchurl, autoreconfHook, pkg-config, libiconv, openssl, pcre, zlib }: -import ./versions.nix ({ version, sha256 }: +import ./versions.nix ({ version, sha256, vendorSha256 ? throw "unsupported version ${version} for zabbix-agent2", ... }: buildGoModule { pname = "zabbix-agent2"; inherit version; @@ -12,10 +12,7 @@ import ./versions.nix ({ version, sha256 }: modRoot = "src/go"; - vendorSha256 = - if "${lib.versions.majorMinor version}" == "5.0" then "1417qi061xc4m55z0vz420fr7qpi24kw5yj9wq7iic92smakgkjn" - else if "${lib.versions.majorMinor version}" == "6.0" then "sha256-W95Z9pIhd5MQJAGn94kiVbQVFkmvjGPWfMx4JyJ2/EU=" - else throw "unsupported version ${version} for zabbix-agent2"; + inherit vendorSha256; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ libiconv openssl pcre zlib ]; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index b52015e1c3df..6ecc0b4f338f 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -15,7 +15,7 @@ assert sqliteSupport -> !mysqlSupport && !postgresqlSupport; let inherit (lib) optional optionalString; in - import ./versions.nix ({ version, sha256 }: + import ./versions.nix ({ version, sha256, ... }: stdenv.mkDerivation { pname = "zabbix-proxy"; inherit version; diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 9249e3852e9c..3cffedd5aeb0 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -16,7 +16,7 @@ assert postgresqlSupport -> !mysqlSupport; let inherit (lib) optional optionalString; in - import ./versions.nix ({ version, sha256 }: + import ./versions.nix ({ version, sha256, ... }: stdenv.mkDerivation { pname = "zabbix-server"; inherit version; diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index e19646e71000..cbd095e234cc 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, writeText }: -import ./versions.nix ({ version, sha256 }: +import ./versions.nix ({ version, sha256, ... }: stdenv.mkDerivation rec { pname = "zabbix-web"; inherit version;