From 74c92f5f4aa4123e778e8e6e329976c69ab76fbc Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Jan 2013 12:32:47 -0500 Subject: [PATCH 1/5] First attempt at packaging dd-agent --- pkgs/tools/networking/dd-agent/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/tools/networking/dd-agent/default.nix diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix new file mode 100644 index 00000000000..6e46174bd10 --- /dev/null +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "dd-agent-ab14fde6f9"; + + src = fetchgit { + url = git://github.com/DataDog/dd-agent.git; + rev = "ab14fde6f9b9f6cb3544f643cece97ef18a0d770"; + sha256 = "2615a2f122ac97363eba8973dfc6c2ce81cb61a26eb61c2988faad2abd05efc5"; + }; + + postUnpack = "export sourceRoot=$sourceRoot/packaging"; + + makeFlags = [ "BUILD=$(out)" ]; + + installTargets = [ "install_base" "install_full" ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e674e081e48..44692188101 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6782,6 +6782,8 @@ let inherit (gnome) GConf libglade; }; + "dd-agent" = callPackage ../tools/networking/dd-agent { }; + dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome) libart_lgpl libgnomeui; }; From 4b2632e54a2f5ce725094dda36f0213ea2c59d68 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Jan 2013 12:35:41 -0500 Subject: [PATCH 2/5] dd-agent: Move /usr stuff to directly --- pkgs/tools/networking/dd-agent/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 6e46174bd10..36b46e5e4cc 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -14,4 +14,9 @@ stdenv.mkDerivation rec { makeFlags = [ "BUILD=$(out)" ]; installTargets = [ "install_base" "install_full" ]; + + postInstall = '' + mv $out/usr/* $out + rmdir $out/usr + ''; } From bc2e9573084ab39ba5e04a9a758dd01a96ad3ebc Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Jan 2013 12:42:11 -0500 Subject: [PATCH 3/5] dd-agent: Add python so patchShebangs can patch python scripts --- pkgs/tools/networking/dd-agent/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 36b46e5e4cc..bda5719d278 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchgit, python }: stdenv.mkDerivation rec { name = "dd-agent-ab14fde6f9"; @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "2615a2f122ac97363eba8973dfc6c2ce81cb61a26eb61c2988faad2abd05efc5"; }; + buildInputs = [ python ]; + postUnpack = "export sourceRoot=$sourceRoot/packaging"; makeFlags = [ "BUILD=$(out)" ]; From 76076ea9cf7612a5666c5180986c6aa4f759f97f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Jan 2013 12:48:24 -0500 Subject: [PATCH 4/5] dd-agent: Propagate sysstat --- pkgs/tools/networking/dd-agent/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index bda5719d278..c63056d5b67 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, python }: +{ stdenv, fetchgit, python, sysstat }: stdenv.mkDerivation rec { name = "dd-agent-ab14fde6f9"; @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { buildInputs = [ python ]; + propagatedUserEnvPkgs = [ sysstat ]; + postUnpack = "export sourceRoot=$sourceRoot/packaging"; makeFlags = [ "BUILD=$(out)" ]; From a23c70c4929920eb90efe2180b38526f02af6e81 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 8 Jan 2013 12:55:55 -0500 Subject: [PATCH 5/5] dd-agent: Add meta --- pkgs/tools/networking/dd-agent/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index c63056d5b67..db53df6dd7b 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -23,4 +23,16 @@ stdenv.mkDerivation rec { mv $out/usr/* $out rmdir $out/usr ''; + + meta = { + description = "Event collector for the DataDog analysis service"; + + homepage = http://www.datadoghq.com; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + + license = stdenv.lib.licenses.bsd3; + + platforms = stdenv.lib.platforms.all; + }; }