public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dd-agent: fix Python missing dependencies and versions

Browse Source
This commit is contained in:
Susan Potter 2017-03-10 09:57:51 -06:00 committed by Frederik Rietdijk
parent 262993d2b8
commit 17a8d19032
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkgs/tools/networking/dd-agent/default.nix
View File

@ -1,7 +1,31 @@
{ stdenv, fetchFromGitHub, python, pythonPackages, sysstat, unzip, tornado { stdenv, buildPythonPackage, fetchFromGitHub, python, pythonPackages
, makeWrapper }: , 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"; version = "5.5.2";
name = "dd-agent-${version}"; name = "dd-agent-${version}";
@ -23,7 +47,9 @@ stdenv.mkDerivation rec {
pythonPackages.simplejson pythonPackages.simplejson
pythonPackages.pyyaml pythonPackages.pyyaml
pythonPackages.pymongo pythonPackages.pymongo
pythonPackages.docker pythonPackages.python-etcd
pythonPackages.consul
docker_1_10
]; ];
propagatedBuildInputs = [ python tornado ]; propagatedBuildInputs = [ python tornado ];

2
pkgs/top-level/all-packages.nix
View File

@ -13025,7 +13025,7 @@ with pkgs;
dbvisualizer = callPackage ../applications/misc/dbvisualizer {}; 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 { deadbeef = callPackage ../applications/audio/deadbeef {
pulseSupport = config.pulseaudio or true; pulseSupport = config.pulseaudio or true;