nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-19 19:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #308813 from anthonyroussel/update-nagios

Browse Source 
nagios: 4.5.1 -> 4.5.2
This commit is contained in:
Marcus Ramberg 2024-05-19 00:03:53 +01:00 committed by GitHub
commit b7d845292c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View File

@ -588,7 +588,7 @@ in {
mysql-backup = handleTest ./mysql/mysql-backup.nix {};
mysql-replication = handleTest ./mysql/mysql-replication.nix {};
n8n = handleTest ./n8n.nix {};
nagios = handleTest ./nagios.nix {};
nagios = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nagios.nix {};
nar-serve = handleTest ./nar-serve.nix {};
nat.firewall = handleTest ./nat.nix { withFirewall = true; };
nat.standalone = handleTest ./nat.nix { withFirewall = false; };

21
pkgs/servers/monitoring/nagios/default.nix
View File

@ -10,17 +10,18 @@
, unzip
, nixosTests
, nix-update-script
, testers
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "nagios";
version = "4.5.1";
version = "4.5.2";
src = fetchFromGitHub {
owner = "NagiosEnterprises";
repo = "nagioscore";
rev = "refs/tags/nagios-${version}";
hash = "sha256-+U2k3w3Yr0qZjHwjRpKZVucB3a35PSZr1Sqa8k0ssq8=";
rev = "refs/tags/nagios-${finalAttrs.version}";
hash = "sha256-LD572aR6g67pH3QllnLD3g0bnck+vlC/YTN83WamHRs=";
};
patches = [ ./nagios.patch ];
@ -46,7 +47,7 @@ stdenv.mkDerivation rec {
# Do not create /var directories
preInstall = ''
substituteInPlace Makefile --replace '$(MAKE) install-basic' ""
substituteInPlace Makefile --replace-fail '$(MAKE) install-basic' ""
'';
installTargets = "install install-config";
postInstall = ''
@ -59,6 +60,10 @@ stdenv.mkDerivation rec {
passthru = {
tests = {
inherit (nixosTests) nagios;
version = testers.testVersion {
package = finalAttrs.finalPackage;
command = "nagios --version";
};
};
updateScript = nix-update-script {
extraArgs = [ "--version-regex" "nagios-(.*)" ];
@ -68,10 +73,10 @@ stdenv.mkDerivation rec {
meta = {
description = "A host, service and network monitoring program";
homepage = "https://www.nagios.org/";
changelog = "https://github.com/NagiosEnterprises/nagioscore/blob/nagios-${version}/Changelog";
changelog = "https://github.com/NagiosEnterprises/nagioscore/blob/nagios-${finalAttrs.version}/Changelog";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
mainProgram = "nagios";
maintainers = with lib.maintainers; [ immae thoughtpolice relrod anthonyroussel ];
};
}
})