Merge pull request #20763 from lsix/update_nagios

nagios: 4.0.8 -> 4.2.3 (for CVE)
This commit is contained in:
Graham Christensen 2016-11-28 18:12:03 -05:00 committed by GitHub
commit 59695de3b1
2 changed files with 6 additions and 6 deletions

View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, perl, php, gd, libpng, zlib }: { stdenv, fetchurl, perl, php, gd, libpng, zlib, unzip }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nagios-${version}"; name = "nagios-${version}";
version = "4.0.8"; version = "4.2.3";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz"; url = "mirror://sourceforge/nagios/nagios-4.x/${name}/${name}.tar.gz";
sha256 = "0jyad39wa318613awlnpczrrakvjcipz8qp1mdsig1cp1hjqs9lb"; sha256 = "0p16sm5pkbzf4py30hwzm38194cl23wfzsvkhk4jkf3p1fq7xvl3";
}; };
patches = [ ./nagios.patch ]; patches = [ ./nagios.patch ];
buildInputs = [ php perl gd libpng zlib ]; buildInputs = [ php perl gd libpng zlib unzip ];
configureFlags = [ "--localstatedir=/var/lib/nagios" ]; configureFlags = [ "--localstatedir=/var/lib/nagios" ];
buildFlags = "all"; buildFlags = "all";

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nagios-plugins-${version}"; name = "nagios-plugins-${version}";
version = "2.0.3"; version = "2.1.4";
src = fetchurl { src = fetchurl {
url = "http://nagios-plugins.org/download/${name}.tar.gz"; url = "http://nagios-plugins.org/download/${name}.tar.gz";
sha256 = "0jm0mn55hqwl8ffx8ww9mql2wrkhp1h2k8jw53q3h0ff5m22204g"; sha256 = "146hrpcwciz0niqsv4k5yvkhaggs9mr5v02xnnxp5yp0xpdbama3";
}; };
# !!! Awful hack. Grrr... this of course only works on NixOS. # !!! Awful hack. Grrr... this of course only works on NixOS.