Merge pull request #18243 from mbbx6spp/update-rsyslog-to-8.21
rsyslog: 8.17.0 -> 8.21.0
This commit is contained in:
commit
70b2ea1fcb
|
@ -1,13 +1,13 @@
|
||||||
{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
|
{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "v0.99.2";
|
version = "v0.99.4";
|
||||||
name = "fastjson-${version}";
|
name = "fastjson-${version}";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
repo = "libfastjson";
|
repo = "libfastjson";
|
||||||
owner = "rsyslog";
|
owner = "rsyslog";
|
||||||
rev = "eabae907c9d991143e17da278a239819f2e8ae1c";
|
rev = "6e057a094cb225c9d80d8d6e6b1f36ca88a942dd";
|
||||||
sha256 = "17fhaqdn0spc4p0848ahcy68swm6l5yd3bx6bdzxmmwj1jdrmvzk";
|
sha256 = "1pn207p9zns0aqm6z5l5fdgb94wyyhaw83lyvyfdxmai74nbqs65";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ autoconf automake libtool ];
|
buildInputs = [ autoconf automake libtool ];
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, gnutls, zlib }:
|
{ stdenv, fetchurl, pkgconfig, gnutls, zlib }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "librelp-1.2.8";
|
name = "librelp-1.2.12";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
|
url = "http://download.rsyslog.com/librelp/${name}.tar.gz";
|
||||||
sha256 = "1qxj7isa2d10aw6c4a9pd3fx08vv06rrhac312avgcjmdqaa88r6";
|
sha256 = "1mvvxqfsfg96rb6xv3fw7mcsqmyfnsb74sc53gnhpcpp4h2p6m83";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pkgconfig gnutls zlib ];
|
buildInputs = [ pkgconfig gnutls zlib ];
|
||||||
|
|
|
@ -11,11 +11,11 @@ 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.17.0";
|
name = "rsyslog-8.21.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 = "1fazpbllr3wk8aw41zk7b6iirds4h8j3im080nf8my2cjssij7pc";
|
sha256 = "1arrhc9fw79sp7dxkf7gyfwibyr2i1000pfds5c7n43mgglgvcdx";
|
||||||
};
|
};
|
||||||
|
|
||||||
#patches = [ ./fix-gnutls-detection.patch ];
|
#patches = [ ./fix-gnutls-detection.patch ];
|
||||||
|
|
Loading…
Reference in a new issue