* Zabbix updated to 1.8.1.

svn path=/nixpkgs/trunk/; revision=20009

pkgs/servers/monitoring/zabbix/default.nix

@@ -1,34 +1,73 @@
-{stdenv, fetchurl, enableServer ? false, postgresql ? null, curl ? null}:
+{ stdenv, fetchurl, pkgconfig, postgresql, curl, openssl, zlib }:
 
-stdenv.mkDerivation {
+let
-  name = "zabbix-1.4.6";
 
+  version = "1.8.1";
+  
   src = fetchurl {
-    url = mirror://sourceforge/zabbix/zabbix-1.4.6.tar.gz;
+    url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "19xczaiprn820jnq9lhixdhd3d6ffkjk80l98lwxzrz2zc2s06n9";
+    sha256 = "0z4a5lbpgszc2vfg2hc30c1l3l1lbihinqx2sygxf9r5y9k7fj7g";
   };
 
-  configureFlags = "--enable-agent " +
+in
-    (if enableServer then ''
-      --enable-server
-      --with-pgsql
-      --with-libcurl
-    '' else "");
 
-  buildInputs = stdenv.lib.optionals enableServer [postgresql curl];
+{
 
-  postInstall = if enableServer then ''
+  server = stdenv.mkDerivation {
-    ensureDir $out/share/zabbix
+    name = "zabbix-${version}";
-    cp -prvd frontends/php $out/share/zabbix/php
-    ensureDir $out/share/zabbix/db/data
-    cp -prvd create/data/*.sql $out/share/zabbix/db/data
-    ensureDir $out/share/zabbix/db/schema
-    cp -prvd create/schema/*.sql $out/share/zabbix/db/schema
-  '' else ""; # */
 
-  meta = {
+    inherit src;
-    description = "An enterprise-class open source distributed monitoring solution";
+
-    homepage = http://www.zabbix.com/;
+    configureFlags = "--enable-agent --enable-server --with-pgsql --with-libcurl";
-    license = "GPL";
+
+    preConfigure =
+      ''
+        substituteInPlace ./configure \
+          --replace " -static" "" \
+          --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h
+      '';
+
+    buildInputs = [ pkgconfig postgresql curl openssl zlib ];
+
+    postInstall =
+      ''
+        ensureDir $out/share/zabbix
+        cp -prvd frontends/php $out/share/zabbix/php
+        ensureDir $out/share/zabbix/db/data
+        cp -prvd create/data/*.sql $out/share/zabbix/db/data
+        ensureDir $out/share/zabbix/db/schema
+        cp -prvd create/schema/*.sql $out/share/zabbix/db/schema
+      '';
+
+    meta = {
+      description = "An enterprise-class open source distributed monitoring solution";
+      homepage = http://www.zabbix.com/;
+      license = "GPL";
+      maintainers = [ stdenv.lib.maintainers.eelco ];
+      platforms = stdenv.lib.platforms.linux;
+    };
   };
+  
+  agent = stdenv.mkDerivation {
+    name = "zabbix-agent-${version}";
+
+    inherit src;
+
+    configureFlags = "--enable-agent";
+
+    preConfigure =
+      ''
+        substituteInPlace ./configure \
+          --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h
+      '';
+
+    meta = {
+      description = "An enterprise-class open source distributed monitoring solution (client-side agent)";
+      homepage = http://www.zabbix.com/;
+      license = "GPL";
+      maintainers = [ stdenv.lib.maintainers.eelco ];
+      platforms = stdenv.lib.platforms.all;
+    };
+  };
+  
 }

pkgs/top-level/all-packages.nix

@@ -5602,15 +5602,9 @@ let
       libXext utilmacros;
   };
 
-  zabbixAgent = import ../servers/monitoring/zabbix {
+  zabbix = recurseIntoAttrs (import ../servers/monitoring/zabbix {
-    inherit fetchurl stdenv;
+    inherit fetchurl stdenv pkgconfig postgresql curl openssl zlib;
-    enableServer = false;
+  });
-  };
-
-  zabbixServer = import ../servers/monitoring/zabbix {
-    inherit fetchurl stdenv postgresql curl;
-    enableServer = true;
-  };
 
 
   ### OS-SPECIFIC