dd-agent: 5.5.2 -> 5.11.2

NixOS · Mar 10, 2017 · 35f9f63 · 35f9f63
1 parent 17a8d19
commit 35f9f63
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, python, pythonPackages
-, sysstat, unzip, tornado, makeWrapper }:
+{ stdenv, fetchFromGitHub, pythonPackages
+, sysstat, unzip, makeWrapper }:
 let
-  docker_1_10 = buildPythonPackage rec {
+  inherit (pythonPackages) python;
+  docker_1_10 = pythonPackages.buildPythonPackage rec {
     name = "docker-${version}";
     version = "1.10.6";
 
@@ -26,14 +27,14 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  version = "5.5.2";
+  version = "5.11.2";
   name = "dd-agent-${version}";
 
   src = fetchFromGitHub {
     owner  = "datadog";
     repo   = "dd-agent";
     rev    = version;
-    sha256 = "0ga7h3rdg6q2pi4dxxkird5nf6s6hc13mj1xd9awwpli48gyvxn7";
+    sha256 = "1iqxvgpsqibqw3vk79158l2pnb6y4pjhjp2d6724lm5rpz4825lx";
   };
 
   buildInputs = [
@@ -51,7 +52,7 @@ in stdenv.mkDerivation rec {
     pythonPackages.consul
     docker_1_10
   ];
-  propagatedBuildInputs = [ python tornado ];
+  propagatedBuildInputs = with pythonPackages; [ python tornado ];
 
   buildCommand = ''
     mkdir -p $out/bin

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -13025,7 +13025,7 @@ with pkgs;
 
   dbvisualizer = callPackage ../applications/misc/dbvisualizer {};
 
-  dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado buildPythonPackage; };
+  dd-agent = callPackage ../tools/networking/dd-agent { };
 
   deadbeef = callPackage ../applications/audio/deadbeef {
     pulseSupport = config.pulseaudio or true;