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

dd-agent: 5.5.2 -> 5.11.2

Browse Source
This commit is contained in:
Susan Potter 2017-03-10 09:58:58 -06:00 committed by Frederik Rietdijk
parent 17a8d19032
commit 35f9f63a39
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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 buildPythonPackage; }; dd-agent = callPackage ../tools/networking/dd-agent { };
deadbeef = callPackage ../applications/audio/deadbeef { deadbeef = callPackage ../applications/audio/deadbeef {
pulseSupport = config.pulseaudio or true; pulseSupport = config.pulseaudio or true;