Unverified Commit b7d84529 authored by Marcus Ramberg's avatar Marcus Ramberg Committed by GitHub
Browse files

Merge pull request #308813 from anthonyroussel/update-nagios 

nagios: 4.5.1 -> 4.5.2
parents c06e9b08 d4d29642

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -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; };

pkgs/servers/monitoring/nagios/default.nix

+13 −8
Original line number Diff line number Diff line
@@ -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 ];

  };

}
 
})