diff options
author | Robert Scott <code@humanleg.org.uk> | 2024-02-25 19:20:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-25 19:20:24 +0000 |
commit | 8f800fe1fc19a5e202db07703d6816b3f9b08869 (patch) | |
tree | e3813844be3d4fdce9bf733b9308b18702b3eee9 /pkgs/servers/monitoring | |
parent | 8e474340ed0592ca21c1398d88dd89bf7100e881 (diff) | |
parent | 01134358a0b3fe2792204bb61098a6b592fc6348 (diff) | |
download | nixlib-8f800fe1fc19a5e202db07703d6816b3f9b08869.tar nixlib-8f800fe1fc19a5e202db07703d6816b3f9b08869.tar.gz nixlib-8f800fe1fc19a5e202db07703d6816b3f9b08869.tar.bz2 nixlib-8f800fe1fc19a5e202db07703d6816b3f9b08869.tar.lz nixlib-8f800fe1fc19a5e202db07703d6816b3f9b08869.tar.xz nixlib-8f800fe1fc19a5e202db07703d6816b3f9b08869.tar.zst nixlib-8f800fe1fc19a5e202db07703d6816b3f9b08869.zip |
Merge pull request #291148 from LeSuisse/zabbix-upgrades
zabbix50: 5.0.37 -> 5.0.41, zabbix60: 6.0.21 -> 6.0.26
Diffstat (limited to 'pkgs/servers/monitoring')
-rw-r--r-- | pkgs/servers/monitoring/zabbix/agent.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/agent2.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/proxy.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/server.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/versions.nix | 10 | ||||
-rw-r--r-- | pkgs/servers/monitoring/zabbix/web.nix | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index 4aaeb9f103d6..3f1d80ca4df9 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, pkg-config, libiconv, openssl, pcre }: -import ./versions.nix ({ version, sha256, ... }: +import ./versions.nix ({ version, hash, ... }: stdenv.mkDerivation { pname = "zabbix-agent"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/monitoring/zabbix/agent2.nix b/pkgs/servers/monitoring/zabbix/agent2.nix index 718522c8fccf..374a137297f1 100644 --- a/pkgs/servers/monitoring/zabbix/agent2.nix +++ b/pkgs/servers/monitoring/zabbix/agent2.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchurl, autoreconfHook, pkg-config, libiconv, openssl, pcre, zlib }: -import ./versions.nix ({ version, sha256, vendorHash ? throw "unsupported version ${version} for zabbix-agent2", ... }: +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"; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index f9088e682bdb..b287ef56c76f 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -15,14 +15,14 @@ assert sqliteSupport -> !mysqlSupport && !postgresqlSupport; let inherit (lib) optional optionalString; in - import ./versions.nix ({ version, sha256, ... }: + import ./versions.nix ({ version, hash, ... }: stdenv.mkDerivation { pname = "zabbix-proxy"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 3cffedd5aeb0..5abf6a93d55d 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -16,14 +16,14 @@ assert postgresqlSupport -> !mysqlSupport; let inherit (lib) optional optionalString; in - import ./versions.nix ({ version, sha256, ... }: + import ./versions.nix ({ version, hash, ... }: stdenv.mkDerivation { pname = "zabbix-server"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index cf4d9bc8508b..6fe89a17c357 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,13 +1,13 @@ generic: { v60 = generic { - version = "6.0.21"; - sha256 = "sha256-hdKPI5UEQvF/URH2eLWW32az3LMEse3UXIELOsfvwzk="; + version = "6.0.26"; + hash = "sha256-MIOKe5hqfDecB1oWZKzbFmJCsQLuAGtp21l2WxxVG+g="; vendorHash = null; }; v50 = generic { - version = "5.0.37"; - sha256 = "sha256-+C5fI+eMJKsynVnVJIYj27x1iFQwaG9Fnho0BXgENQI="; - vendorHash = "sha256-oSZBzIUL1yHXk7PnkSAlhI0i89aGMFrFHmbMN9rDAJ0="; + version = "5.0.41"; + hash = "sha256-pPvw0lPoK1IpsXc5c8Qu9zFhx2oHJz2bwiX80vrYa58="; + vendorHash = "sha256-qLDoNnEFiSrWXbLtYlmQaqY8Rv6JaG8WbMYBlry5Evc="; }; } diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index cbd095e234cc..7267e3046dd7 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, writeText }: -import ./versions.nix ({ version, sha256, ... }: +import ./versions.nix ({ version, hash, ... }: stdenv.mkDerivation rec { pname = "zabbix-web"; inherit version; src = fetchurl { url = "https://cdn.zabbix.com/zabbix/sources/stable/${lib.versions.majorMinor version}/zabbix-${version}.tar.gz"; - inherit sha256; + inherit hash; }; phpConfig = writeText "zabbix.conf.php" '' |