From 4e8bf822134631fc79fc09ef635377f43e53b936 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Nov 2007 18:17:56 +0000
Subject: [PATCH] * Latest Nagios.

svn path=/nixpkgs/trunk/; revision=9608
---
 pkgs/servers/monitoring/nagios/default.nix           | 12 +++++++++---
 .../monitoring/nagios/plugins/official/default.nix   | 12 +++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index 54f1d3a40f56..8a24e9dfaa41 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -1,15 +1,21 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation {
-  name = "nagios-2.6";
+  name = "nagios-2.10";
 
   src = fetchurl {
-    url = mirror://sourceforge/nagios/nagios-2.6.tar.gz;
-    md5 = "a032edba07bf389b803ce817e9406c02";
+    url = mirror://sourceforge/nagios/nagios-2.10.tar.gz;
+    md5 = "8c3a29e138f2ff8c8abbd3dd8a40c4b6";
   };
 
   patches = [./nagios.patch];
   buildInputs = [perl];
   buildFlags = "all";
   installTargets = "install install-config";
+
+  meta = {
+    description = "A host, service and network monitoring program";
+    homepage = http://www.nagios.org/;
+    license = "GPL";
+  };
 }
diff --git a/pkgs/servers/monitoring/nagios/plugins/official/default.nix b/pkgs/servers/monitoring/nagios/plugins/official/default.nix
index 1b49d30176f6..56bd77134090 100644
--- a/pkgs/servers/monitoring/nagios/plugins/official/default.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/official/default.nix
@@ -1,10 +1,16 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "nagios-plugins-1.4.5";
+  name = "nagios-plugins-1.4.10";
 
   src = fetchurl {
-    url = mirror://sourceforge/nagiosplug/nagios-plugins-1.4.5.tar.gz;
-    md5 = "359afddaf6a8e3228a5130b60bed0f67";
+    url = mirror://sourceforge/nagiosplug/nagios-plugins-1.4.10.tar.gz;
+    sha256 = "0vm7sjiygxbfc5vbsi1g0dakpvynfzi86fhqx4yxd61brn0g8ghr";
+  };
+
+  meta = {
+    description = "Official plugins for Nagios";
+    homepage = http://www.nagios.org/;
+    license = "GPL";
   };
 }