From ecddd8b47288a0c6e16c4e97a0143107dc63fdc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 5 Feb 2009 16:50:45 +0000 Subject: [PATCH] Added syslog-ng (and the eventlog library that it depends on). svn path=/nixpkgs/trunk/; revision=13988 --- .../libraries/eventlog/default.nix | 15 +++++++++++++++ pkgs/tools/misc/syslog-ng/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 19 ++++++++++++++----- 3 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/eventlog/default.nix create mode 100644 pkgs/tools/misc/syslog-ng/default.nix diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix new file mode 100644 index 000000000000..bed565a04379 --- /dev/null +++ b/pkgs/development/libraries/eventlog/default.nix @@ -0,0 +1,15 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "eventlog-0.2.9"; + src = fetchurl { + url = "http://www.balabit.com/downloads/files/eventlog/0.2/eventlog_0.2.9.tar.gz"; + sha256 = "1cairmv47b66blrxwrgf4qwabfflak9b1dwkiyxnc9rj5svnq50m"; + }; + + meta = { + description = "A new API to format and send structured log messages."; + homepage = "http://www.balabit.com/support/community/products/"; + license = "BSD"; + }; +} diff --git a/pkgs/tools/misc/syslog-ng/default.nix b/pkgs/tools/misc/syslog-ng/default.nix new file mode 100644 index 000000000000..fa920120bd3b --- /dev/null +++ b/pkgs/tools/misc/syslog-ng/default.nix @@ -0,0 +1,16 @@ +{stdenv, fetchurl, eventlog, pkgconfig, glib}: + +stdenv.mkDerivation rec { + name = "syslog-ng-2.1.3"; + meta = { + homepage = "http://www.balabit.com/network-security/syslog-ng/"; + description = "Next-generation syslogd with advanced networking and filtering capabilities."; + license = "GPLv2"; + }; + src = fetchurl { + url = "http://www.balabit.com/downloads/files/syslog-ng/sources/2.1/src/${name}.tar.gz"; + sha256 = "1m6djxhmihmg09a90gg6mp1ghgk2zm8rcp04shh458433rbzfjb0"; + }; + buildInputs = [eventlog pkgconfig glib]; + configureFlags = "--enable-dynamic-linking"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15f9d4941310..055f81f0a314 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -474,7 +474,7 @@ let done < graph ''; - + ### TOOLS @@ -525,6 +525,11 @@ let inherit fetchurl stdenv perl; }; + syslogng = import ../tools/misc/syslog-ng { + inherit fetchurl stdenv eventlog pkgconfig; + inherit (gtkLibs) glib; + }; + asciidoc = import ../tools/typesetting/asciidoc { inherit fetchurl stdenv bash python; }; @@ -2142,8 +2147,8 @@ let }; # new python and lib proposal - # - adding a python lib to buildinputs should be enough - # (handles .pth files by patching site.py + # - adding a python lib to buildinputs should be enough + # (handles .pth files by patching site.py # while introducing NIX_PYTHON_SITES describing list of modules) # - adding pyCheck = "import foo" test scripts to ensure libraries can be imported # - providing pythonWrapper so that you can run python and import the selected libraries @@ -2863,6 +2868,10 @@ let inherit fetchurl stdenv; }; + eventlog = import ../development/libraries/eventlog { + inherit fetchurl stdenv; + }; + facile = import ../development/libraries/facile { inherit fetchurl stdenv; # Actually, we don't need this version but we need native-code compilation @@ -5573,7 +5582,7 @@ let url = mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz; sha256 = "0gyp5qfbflhkin1zv8l6wlkjwfjvsf45a3py4vc6ni82fj32kmcz"; }; - makeMakerFlags = "EXPATLIBPATH=${expat}/lib EXPATINCPATH=${expat}/include"; + makeMakerFlags = "EXPATLIBPATH=${expat}/lib EXPATINCPATH=${expat}/include"; }; perlXMLRegExp = buildPerlPackage { @@ -8524,7 +8533,7 @@ let }; xboard = builderDefsPackage (import ../games/xboard) { - inherit (xlibs) libX11 xproto libXt libXaw libSM + inherit (xlibs) libX11 xproto libXt libXaw libSM libICE libXmu libXext; inherit gnuchess; };