diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2015-01-05 12:58:04 +0100 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2015-01-05 13:15:36 +0100 |
| commit | 87b9925f23e452fc8b08931e2d4675701c4021ba (patch) | |
| tree | e3848b2d11efd2576afc9b2c8de9ec7776e582dd /pkgs | |
| parent | c5caa853ec00d5c9fe3a66f2996d420153f7275a (diff) | |
| download | nixlib-87b9925f23e452fc8b08931e2d4675701c4021ba.tar nixlib-87b9925f23e452fc8b08931e2d4675701c4021ba.tar.gz nixlib-87b9925f23e452fc8b08931e2d4675701c4021ba.tar.bz2 nixlib-87b9925f23e452fc8b08931e2d4675701c4021ba.tar.lz nixlib-87b9925f23e452fc8b08931e2d4675701c4021ba.tar.xz nixlib-87b9925f23e452fc8b08931e2d4675701c4021ba.tar.zst nixlib-87b9925f23e452fc8b08931e2d4675701c4021ba.zip | |
Update dd-agent to 5.1.1
(cherry picked from commit 7f02b1f35042f6ac345933bd3823439535a95234)
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/dd-agent/default.nix | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 04ab3a0a4172..dc29697044a3 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -2,34 +2,36 @@ , makeWrapper }: stdenv.mkDerivation rec { - version = "4.4.0"; + version = "5.1.1"; name = "dd-agent-${version}"; src = fetchFromGitHub { owner = "DataDog"; repo = "dd-agent"; rev = version; - sha256 = "0z2gysr5g66rfd86k2ngwcm59k9y2zmrvmy22aaz2rky20z28xkx"; + sha256 = "17gj2bsnidwwmwfc0m2ll90sh28izpxz2wkczpnvzfiq0askdxmp"; }; - buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 ]; + buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 pythonPackages.ntplib pythonPackages.simplejson pythonPackages.pyyaml pythonPackages.requests ]; propagatedBuildInputs = [ python tornado ]; - postUnpack = "export sourceRoot=$sourceRoot/packaging"; + buildCommand = '' + mkdir -p $out/bin + cp -R $src $out/agent + chmod u+w -R $out + PYTHONPATH=$out/agent:$PYTHONPATH + ln -s $out/agent/agent.py $out/bin/dd-agent + ln -s $out/agent/dogstatsd.py $out/bin/dogstatsd + ln -s $out/agent/ddagent.py $out/bin/dd-forwarder - makeFlags = [ "BUILD=$(out)" ]; - - installTargets = [ "install_base" "install_full" ]; - - postInstall = '' - mv $out/usr/* $out - rmdir $out/usr wrapProgram $out/bin/dd-forwarder \ --prefix PYTHONPATH : $PYTHONPATH wrapProgram $out/bin/dd-agent \ --prefix PYTHONPATH : $PYTHONPATH wrapProgram $out/bin/dogstatsd \ --prefix PYTHONPATH : $PYTHONPATH + + patchShebangs $out ''; meta = { |