about summary refs log tree commit diff
path: root/pkgs/tools/networking/dd-agent
diff options
context:
space:
mode:
authorSusan Potter <me@susanpotter.net>2017-03-10 09:57:51 -0600
committerFrederik Rietdijk <fridh@fridh.nl>2017-03-10 17:35:27 +0100
commit17a8d19032b45126e6ec3814e98d25dbe37a18be (patch)
tree4e4a8e58c9607591ce54bf2d8a5820d6595c52e4 /pkgs/tools/networking/dd-agent
parent262993d2b872201b2e765a48f8fd5d9bf7913f11 (diff)
downloadnixlib-17a8d19032b45126e6ec3814e98d25dbe37a18be.tar
nixlib-17a8d19032b45126e6ec3814e98d25dbe37a18be.tar.gz
nixlib-17a8d19032b45126e6ec3814e98d25dbe37a18be.tar.bz2
nixlib-17a8d19032b45126e6ec3814e98d25dbe37a18be.tar.lz
nixlib-17a8d19032b45126e6ec3814e98d25dbe37a18be.tar.xz
nixlib-17a8d19032b45126e6ec3814e98d25dbe37a18be.tar.zst
nixlib-17a8d19032b45126e6ec3814e98d25dbe37a18be.zip
dd-agent: fix Python missing dependencies and versions
Diffstat (limited to 'pkgs/tools/networking/dd-agent')
-rw-r--r--pkgs/tools/networking/dd-agent/default.nix34
1 files changed, 30 insertions, 4 deletions
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix
index 0e12c50d1546..2cfef9a53a84 100644
--- a/pkgs/tools/networking/dd-agent/default.nix
+++ b/pkgs/tools/networking/dd-agent/default.nix
@@ -1,7 +1,31 @@
-{ stdenv, fetchFromGitHub, python, pythonPackages, sysstat, unzip, tornado
-, makeWrapper }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, python, pythonPackages
+, sysstat, unzip, tornado, makeWrapper }:
+let
+  docker_1_10 = buildPythonPackage rec {
+    name = "docker-${version}";
+    version = "1.10.6";
 
-stdenv.mkDerivation rec {
+    src = fetchFromGitHub {
+      owner = "docker";
+      repo = "docker-py";
+      rev = version;
+      sha256 = "1awzpbrkh4fympqzddz5i3ml81b7f0i0nwkvbpmyxjjfqx6l0m4m";
+    };
+
+    propagatedBuildInputs = with pythonPackages; [
+      six
+      requests2
+      websocket_client
+      ipaddress
+      backports_ssl_match_hostname
+      docker_pycreds
+    ];
+
+    # due to flake8
+    doCheck = false;
+  };
+
+in stdenv.mkDerivation rec {
   version = "5.5.2";
   name = "dd-agent-${version}";
 
@@ -23,7 +47,9 @@ stdenv.mkDerivation rec {
     pythonPackages.simplejson
     pythonPackages.pyyaml
     pythonPackages.pymongo
-    pythonPackages.docker
+    pythonPackages.python-etcd
+    pythonPackages.consul
+    docker_1_10
   ];
   propagatedBuildInputs = [ python tornado ];