From a4ebaa61e426b3a9c2625be37cfb4828a64a30d6 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 8 Apr 2014 09:27:09 +0200
Subject: [PATCH] Update dd-agent to 4.2.0

---
 pkgs/tools/networking/dd-agent/default.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index d9fa49320a5..1e0f26cc92c 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, python, sysstat, unzip }:
+{ stdenv, fetchurl, python, sysstat, unzip, tornado, makeWrapper }:
 
 stdenv.mkDerivation rec {
-    version = "4.0.1";
+    version = "4.2.0";
     name = "dd-agent-${version}";
 
     src = fetchurl {
       url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
-      sha256 = "0gybdbjkj7qwnzic03xkypagb30zhm22gp3nkwrdhi8fdmwz3nm1";
+      sha256 = "0lp3h3flb50i64kgkj9kyyf3p1xm0nipxi22w5pmhb71l678d216";
     };
 
-    buildInputs = [ python unzip ];
-    propagatedBuildInputs = [ python ];
+    buildInputs = [ python unzip makeWrapper ];
+    propagatedBuildInputs = [ python tornado ];
 
     postUnpack = "export sourceRoot=$sourceRoot/packaging";
 
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     postInstall = ''
       mv $out/usr/* $out
       rmdir $out/usr
+      wrapProgram $out/bin/dd-forwarder --prefix PYTHONPATH : $PYTHONPATH
     '';
 
     meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 046eead410c..ed5a3d3ab73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7835,7 +7835,7 @@ let
     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 {
     inherit (pkgs.gnome) libart_lgpl libgnomeui;