1 files changed, 39 insertions, 34 deletions
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 91061a457d41..8ff45e733fb9 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,37 +1,42 @@
-{ stdenv, fetchurl, python, sysstat, unzip }:
+{ stdenv, fetchFromGitHub, python, pythonPackages, sysstat, unzip, tornado
+, makeWrapper }:
 
 stdenv.mkDerivation rec {
-    version = "3.8.0";
-    name = "dd-agent-${version}";
-
-    src = fetchurl {
-      url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
-      sha256 = "1mh22rbja07gc7ydn357hlij0dl2rygkqsya9ckynsvmkkzn2gyx";
-    };
-
-    buildInputs = [ python unzip ];
-    propagatedBuildInputs = [ python ];
-
-    postUnpack = "export sourceRoot=$sourceRoot/packaging";
-
-    makeFlags = [ "BUILD=$(out)" ];
-
-    installTargets = [ "install_base" "install_full" ];
-
-    postInstall = ''
-      mv $out/usr/* $out
-      rmdir $out/usr
-    '';
-
-    meta = {
-      description = "Event collector for the DataDog analysis service";
-
-      homepage = http://www.datadoghq.com;
-
-      maintainers = [ stdenv.lib.maintainers.shlevy stdenv.lib.maintainers.iElectric ];
-
-      license = stdenv.lib.licenses.bsd3;
-
-      platforms = stdenv.lib.platforms.all;
-    };
+  version = "4.3.1";
+  name = "dd-agent-${version}";
+
+  src = fetchFromGitHub {
+    owner = "DataDog";
+    repo = "dd-agent";
+    rev = version;
+    sha256 = "0z6b1s30fyd9ldahizrjwcxx7c7dd74xsqy19j3qykrb25j9cvmn";
+  };
+
+  buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 ];
+  propagatedBuildInputs = [ python tornado ];
+
+  postUnpack = "export sourceRoot=$sourceRoot/packaging";
+
+  makeFlags = [ "BUILD=$(out)" ];
+
+  installTargets = [ "install_base" "install_full" ];
+
+  postInstall = ''
+    mv $out/usr/* $out
+    rmdir $out/usr
+    wrapProgram $out/bin/dd-forwarder \
+      --prefix PYTHONPATH : $PYTHONPATH
+    wrapProgram $out/bin/dd-agent \
+      --prefix PYTHONPATH : $PYTHONPATH
+    wrapProgram $out/bin/dogstatsd \
+      --prefix PYTHONPATH : $PYTHONPATH
+  '';
+
+  meta = {
+    description = "Event collector for the DataDog analysis service";
+    homepage    = http://www.datadoghq.com;
+    license     = stdenv.lib.licenses.bsd3;
+    platforms   = stdenv.lib.platforms.all;
+    maintainers = with stdenv.lib.maintainers; [ thoughtpolice iElectric ];
+  };
 }