ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-17 14:19:58 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #291148 from LeSuisse/zabbix-upgrades

Browse Source 
zabbix50: 5.0.37 -> 5.0.41, zabbix60: 6.0.21 -> 6.0.26
This commit is contained in:
Robert Scott 2024-02-25 19:20:24 +00:00 committed by GitHub
commit 8f800fe1fc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/monitoring/zabbix/agent.nix
View File

@ -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 ];

4
pkgs/servers/monitoring/zabbix/agent2.nix
View File

@ -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";

4
pkgs/servers/monitoring/zabbix/proxy.nix
View File

@ -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 ];

4
pkgs/servers/monitoring/zabbix/server.nix
View File

@ -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 ];

10
pkgs/servers/monitoring/zabbix/versions.nix
View File

@ -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=";
};
}

4
pkgs/servers/monitoring/zabbix/web.nix
View File

@ -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" ''