Update dd-agent to 4.2.0

This commit is contained in:
Rob Vermaas 2014-04-08 09:27:09 +02:00
parent 593c633aa8
commit a4ebaa61e4
2 changed files with 7 additions and 6 deletions

View File

@ -1,16 +1,16 @@
{ stdenv, fetchurl, python, sysstat, unzip }: { stdenv, fetchurl, python, sysstat, unzip, tornado, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.0.1"; version = "4.2.0";
name = "dd-agent-${version}"; name = "dd-agent-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/DataDog/dd-agent/archive/${version}.zip"; url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
sha256 = "0gybdbjkj7qwnzic03xkypagb30zhm22gp3nkwrdhi8fdmwz3nm1"; sha256 = "0lp3h3flb50i64kgkj9kyyf3p1xm0nipxi22w5pmhb71l678d216";
}; };
buildInputs = [ python unzip ]; buildInputs = [ python unzip makeWrapper ];
propagatedBuildInputs = [ python ]; propagatedBuildInputs = [ python tornado ];
postUnpack = "export sourceRoot=$sourceRoot/packaging"; postUnpack = "export sourceRoot=$sourceRoot/packaging";
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
postInstall = '' postInstall = ''
mv $out/usr/* $out mv $out/usr/* $out
rmdir $out/usr rmdir $out/usr
wrapProgram $out/bin/dd-forwarder --prefix PYTHONPATH : $PYTHONPATH
''; '';
meta = { meta = {

View File

@ -7835,7 +7835,7 @@ let
inherit (gnome) GConf libglade; inherit (gnome) GConf libglade;
}; };
"dd-agent" = callPackage ../tools/networking/dd-agent { }; "dd-agent" = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };
dia = callPackage ../applications/graphics/dia { dia = callPackage ../applications/graphics/dia {
inherit (pkgs.gnome) libart_lgpl libgnomeui; inherit (pkgs.gnome) libart_lgpl libgnomeui;