diff options
author | Susan Potter <me@susanpotter.net> | 2017-03-10 09:58:58 -0600 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-03-10 17:35:27 +0100 |
commit | 35f9f63a39f24f8b7e68451d5860a74260b4e5f8 (patch) | |
tree | c1ea7d3e69137de441c2d1ba84490f04f1df52de | |
parent | 17a8d19032b45126e6ec3814e98d25dbe37a18be (diff) | |
download | nixlib-35f9f63a39f24f8b7e68451d5860a74260b4e5f8.tar nixlib-35f9f63a39f24f8b7e68451d5860a74260b4e5f8.tar.gz nixlib-35f9f63a39f24f8b7e68451d5860a74260b4e5f8.tar.bz2 nixlib-35f9f63a39f24f8b7e68451d5860a74260b4e5f8.tar.lz nixlib-35f9f63a39f24f8b7e68451d5860a74260b4e5f8.tar.xz nixlib-35f9f63a39f24f8b7e68451d5860a74260b4e5f8.tar.zst nixlib-35f9f63a39f24f8b7e68451d5860a74260b4e5f8.zip |
dd-agent: 5.5.2 -> 5.11.2
-rw-r--r-- | pkgs/tools/networking/dd-agent/default.nix | 13 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 2cfef9a53a84..ddef8a70012d 100644 --- 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 index 19f329e7a913..e44665766d62 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 buildPythonPackage; }; + dd-agent = callPackage ../tools/networking/dd-agent { }; deadbeef = callPackage ../applications/audio/deadbeef { pulseSupport = config.pulseaudio or true; |