alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Upgrade rsyslog to latest (v7) stable release. Added liblogging (new dependency of rsyslog).

Browse source
This commit is contained in:
Rob Vermaas 2014-07-07 16:23:54 +02:00
parent 51dc75b769
commit 83e1ff846c
3 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/libraries/liblogging/default.nix Normal file
View file

@ -0,0 +1,18 @@
{ stdenv, fetchurl, pkgconfig, systemd }:
stdenv.mkDerivation rec {
name = "liblogging-1.0.4";
src = fetchurl {
url = "http://download.rsyslog.com/liblogging/${name}.tar.gz";
sha256 = "075q6zjqpdlmaxhahd1ynr6nasqpyjnzj1zlcvzp3ixxm0m5vsxc";
};
buildInputs = [ pkgconfig systemd ];
meta = {
description = "Lightweight signal-safe logging library";
license = stdenv.lib.licenses.bsd2;
platforms = stdenv.lib.platforms.all;
};
}

10
pkgs/tools/system/rsyslog/default.nix
View file

@ -1,14 +1,14 @@
{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd}:
{stdenv, fetchurl, eventlog, pkgconfig, libestr, libee, json_c, libuuid, zlib, gnutls, libgcrypt, systemd, liblogging}:
stdenv.mkDerivation {
name = "rsyslog-7.4.7";
name = "rsyslog-7.6.3";
src = fetchurl {
url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.4.7.tar.gz;
sha256 = "5fc7f930fa748bb6a9d86a3fc831eb1a14107db81b67d79ba8f113cf2776fa21";
url = http://www.rsyslog.com/files/download/rsyslog/rsyslog-7.6.3.tar.gz;
sha256 = "1v7mi2jjyn3awrfxqvd3mg64m5r027dgpbzd511mlvlbbw1mjcq1";
};
buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd];
buildInputs = [pkgconfig libestr libee json_c libuuid zlib gnutls libgcrypt systemd liblogging];
preConfigure = ''
export configureFlags="$configureFlags --enable-gnutls --enable-cached-man-pages --enable-imjournal --with-systemdsystemunitdir=$out/etc/systemd/system"

2
pkgs/top-level/all-packages.nix
View file

@ -5207,6 +5207,8 @@ let
liblockfile = callPackage ../development/libraries/liblockfile { };
liblogging = callPackage ../development/libraries/liblogging { };
libmcrypt = callPackage ../development/libraries/libmcrypt {};
libmhash = callPackage ../development/libraries/libmhash {};