Fix indentation

This commit is contained in:
Eelco Dolstra 2014-05-08 13:49:17 +02:00
parent 46b77d3bb4
commit 2a43a4163a
2 changed files with 29 additions and 29 deletions

View File

@ -2,39 +2,39 @@
, makeWrapper }: , makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.2.1"; version = "4.2.1";
name = "dd-agent-${version}"; name = "dd-agent-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/DataDog/dd-agent/archive/${version}.zip"; url = "https://github.com/DataDog/dd-agent/archive/${version}.zip";
sha256 = "0s1lg7rqx86z0y111105gwkknzplq149cxd7v3yg30l22wn68dmv"; sha256 = "0s1lg7rqx86z0y111105gwkknzplq149cxd7v3yg30l22wn68dmv";
}; };
buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 ]; buildInputs = [ python unzip makeWrapper pythonPackages.psycopg2 ];
propagatedBuildInputs = [ python tornado ]; propagatedBuildInputs = [ python tornado ];
postUnpack = "export sourceRoot=$sourceRoot/packaging"; postUnpack = "export sourceRoot=$sourceRoot/packaging";
makeFlags = [ "BUILD=$(out)" ]; makeFlags = [ "BUILD=$(out)" ];
installTargets = [ "install_base" "install_full" ]; installTargets = [ "install_base" "install_full" ];
postInstall = '' postInstall = ''
mv $out/usr/* $out mv $out/usr/* $out
rmdir $out/usr rmdir $out/usr
wrapProgram $out/bin/dd-forwarder \ wrapProgram $out/bin/dd-forwarder \
--prefix PYTHONPATH : $PYTHONPATH --prefix PYTHONPATH : $PYTHONPATH
wrapProgram $out/bin/dd-agent \ wrapProgram $out/bin/dd-agent \
--prefix PYTHONPATH : $PYTHONPATH --prefix PYTHONPATH : $PYTHONPATH
wrapProgram $out/bin/dogstatsd \ wrapProgram $out/bin/dogstatsd \
--prefix PYTHONPATH : $PYTHONPATH --prefix PYTHONPATH : $PYTHONPATH
''; '';
meta = { meta = {
description = "Event collector for the DataDog analysis service"; description = "Event collector for the DataDog analysis service";
homepage = http://www.datadoghq.com; homepage = http://www.datadoghq.com;
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = with stdenv.lib.maintainers; [ thoughtpolice iElectric ]; maintainers = with stdenv.lib.maintainers; [ thoughtpolice iElectric ];
}; };
} }

View File

@ -7950,7 +7950,7 @@ let
inherit (gnome) GConf libglade; inherit (gnome) GConf libglade;
}; };
"dd-agent" = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; }; dd-agent = callPackage ../tools/networking/dd-agent { inherit (pythonPackages) tornado; };
dia = callPackage ../applications/graphics/dia { dia = callPackage ../applications/graphics/dia {
inherit (pkgs.gnome) libart_lgpl libgnomeui; inherit (pkgs.gnome) libart_lgpl libgnomeui;