diff options
| author | Susan Potter <me@susanpotter.net> | 2017-03-10 09:57:51 -0600 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-03-10 17:35:27 +0100 |
| commit | 17a8d19032b45126e6ec3814e98d25dbe37a18be (patch) | |
| tree | 4e4a8e58c9607591ce54bf2d8a5820d6595c52e4 | |
| parent | 262993d2b872201b2e765a48f8fd5d9bf7913f11 (diff) | |
| download | nixlib-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
| -rw-r--r-- | pkgs/tools/networking/dd-agent/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 31 insertions, 5 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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e4362e0c804..19f329e7a913 100644 --- 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; }; + dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado buildPythonPackage; }; deadbeef = callPackage ../applications/audio/deadbeef { pulseSupport = config.pulseaudio or true; |