about summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2016-11-28 18:12:03 -0500
committerGitHub <noreply@github.com>2016-11-28 18:12:03 -0500
commit59695de3b17aecaea076b20030ee686929a737df (patch)
tree1c769470f96d9e1b2d7cc4331c51b3b64850329b /pkgs
parent105255e6f5c6854ee9629ff1274f19711806399a (diff)
parentc77011c6decc989d11eef7dcbd37625c980f0790 (diff)
downloadnixlib-59695de3b17aecaea076b20030ee686929a737df.tar
nixlib-59695de3b17aecaea076b20030ee686929a737df.tar.gz
nixlib-59695de3b17aecaea076b20030ee686929a737df.tar.bz2
nixlib-59695de3b17aecaea076b20030ee686929a737df.tar.lz
nixlib-59695de3b17aecaea076b20030ee686929a737df.tar.xz
nixlib-59695de3b17aecaea076b20030ee686929a737df.tar.zst
nixlib-59695de3b17aecaea076b20030ee686929a737df.zip
Merge pull request #20763 from lsix/update_nagios
nagios: 4.0.8 -> 4.2.3 (for CVE)
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/servers/monitoring/nagios/default.nix8
-rw-r--r--pkgs/servers/monitoring/nagios/plugins/official-2.x.nix4
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index bf43a93a81b2..c4d60cabaa39 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, perl, php, gd, libpng, zlib }:
+{ stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }:
 
 stdenv.mkDerivation rec {
   name = "nagios-${version}";
-  version = "4.0.8";
+  version = "4.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
-    sha256 = "0jyad39wa318613awlnpczrrakvjcipz8qp1mdsig1cp1hjqs9lb";
+    sha256 = "0p16sm5pkbzf4py30hwzm38194cl23wfzsvkhk4jkf3p1fq7xvl3";
   };
 
   patches = [ ./nagios.patch ];
-  buildInputs = [ php perl gd libpng zlib ];
+  buildInputs = [ php perl gd libpng zlib unzip ];
 
   configureFlags = [ "--localstatedir=/var/lib/nagios" ];
   buildFlags = "all";
diff --git a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
index 79180f172417..306dee0ec627 100644
--- a/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/official-2.x.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nagios-plugins-${version}";
-  version = "2.0.3";
+  version = "2.1.4";
 
   src = fetchurl {
     url = "http://nagios-plugins.org/download/${name}.tar.gz";
-    sha256 = "0jm0mn55hqwl8ffx8ww9mql2wrkhp1h2k8jw53q3h0ff5m22204g";
+    sha256 = "146hrpcwciz0niqsv4k5yvkhaggs9mr5v02xnnxp5yp0xpdbama3";
   };
 
   # !!! Awful hack. Grrr... this of course only works on NixOS.