diff options
author | schnusch <schnusch@users.noreply.github.com> | 2021-11-11 21:29:43 +0100 |
---|---|---|
committer | Andreas Wolf <dev@a-w.io> | 2022-11-07 09:37:39 +0100 |
commit | a4fc9696dafc7f3b67b34979195c561d7ab6b9f2 (patch) | |
tree | 7f0d39f689bd31cce3eeec0e88395a9653765723 | |
parent | 8dd82f3f41928d7663b3a61ddeba87c44852adc5 (diff) | |
download | nixpkgs-a4fc9696dafc7f3b67b34979195c561d7ab6b9f2.tar nixpkgs-a4fc9696dafc7f3b67b34979195c561d7ab6b9f2.tar.gz nixpkgs-a4fc9696dafc7f3b67b34979195c561d7ab6b9f2.tar.bz2 nixpkgs-a4fc9696dafc7f3b67b34979195c561d7ab6b9f2.tar.lz nixpkgs-a4fc9696dafc7f3b67b34979195c561d7ab6b9f2.tar.xz nixpkgs-a4fc9696dafc7f3b67b34979195c561d7ab6b9f2.tar.zst nixpkgs-a4fc9696dafc7f3b67b34979195c561d7ab6b9f2.zip |
zabbix: move vendorSha256 to versions.nix
-rw-r--r-- | pkgs/servers/monitoring/zabbix/agent.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/agent2.nix | 7 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/proxy.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/server.nix | 2 | ||||
-rw-r--r-- | 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 f11af180998..4aaeb9f103d 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 b82ddd3206b..0687e0eaf12 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 b52015e1c3d..6ecc0b4f338 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 9249e3852e9..3cffedd5aeb 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 e19646e7100..cbd095e234c 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; |