public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14449 from NeQuissimus/rsyslog8170

Browse Source 
rsyslog: 8.14.0 -> 8.17.0 (incl. dependencies)
This commit is contained in:
Arseniy Seroka 2016-04-05 19:32:43 +03:00
commit 56c3b2213d
4 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkgs/development/libraries/fastjson/default.nix Normal file
View File

@ -0,0 +1,25 @@
{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
stdenv.mkDerivation rec {
version = "v0.99.2";
name = "fastjson-${version}";
src = fetchFromGitHub {
repo = "libfastjson";
owner = "rsyslog";
rev = "eabae907c9d991143e17da278a239819f2e8ae1c";
sha256 = "17fhaqdn0spc4p0848ahcy68swm6l5yd3bx6bdzxmmwj1jdrmvzk";
};
buildInputs = [ autoconf automake libtool ];
preConfigure = ''
sh autogen.sh
'';
meta = with stdenv.lib; {
description = "A fast json library for C";
homepage = "https://github.com/rsyslog/libfastjson";
license = licenses.mit;
maintainers = with maintainers; [ nequissimus ];
};
}

8
pkgs/development/libraries/libksi/default.nix
View File

@ -4,10 +4,10 @@ stdenv.mkDerivation rec {
name = "libksi-2015-07-03"; name = "libksi-2015-07-03";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rgerhards"; owner = "Guardtime";
repo = "libksi"; repo = "libksi";
rev = "b1ac0346395b4f52ec42a050bf33ac223f194443"; rev = "b82dd65bd693722db92397cbe0920170e0d2ae1c";
sha256 = "0gg0fl56flwqmsph7j92lgybaa39i715w0nwgkcr58njm0c02wlw"; sha256 = "1sqd31l55kx6knl0sg26ail1k5rgmamq8760p6aj7bpb4jwb8r1n";
}; };
nativeBuildInputs = [ autoreconfHook ]; nativeBuildInputs = [ autoreconfHook ];
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://github.com/rgerhards/libksi"; homepage = "https://github.com/GuardTime/libksi";
description = "Keyless Signature Infrastructure API library"; description = "Keyless Signature Infrastructure API library";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.all; platforms = platforms.all;

8
pkgs/tools/system/rsyslog/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages { stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
, libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null
, libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
, libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
@ -11,18 +11,18 @@ let
mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "rsyslog-8.14.0"; name = "rsyslog-8.17.0";
src = fetchurl { src = fetchurl {
url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
sha256 = "1hp7ga543m6vhijcnjb4z8v26ddjgypk1lh6km1cvxc45cfmnfs4"; sha256 = "1fazpbllr3wk8aw41zk7b6iirds4h8j3im080nf8my2cjssij7pc";
}; };
#patches = [ ./fix-gnutls-detection.patch ]; #patches = [ ./fix-gnutls-detection.patch ];
nativeBuildInputs = [ pkgconfig autoreconfHook ]; nativeBuildInputs = [ pkgconfig autoreconfHook ];
buildInputs = [ buildInputs = [
libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql
postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl
librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq
rabbitmq-c hiredis rabbitmq-c hiredis

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

@ -756,6 +756,8 @@ in
fasd = callPackage ../tools/misc/fasd { }; fasd = callPackage ../tools/misc/fasd { };
fastJson = callPackage ../development/libraries/fastjson { };
fop = callPackage ../tools/typesetting/fop { }; fop = callPackage ../tools/typesetting/fop { };
fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; }; fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; };