Merge pull request #18243 from mbbx6spp/update-rsyslog-to-8.21

rsyslog: 8.17.0 -> 8.21.0

authored by Joachim F and committed by GitHub 70b2ea1f e03ea387

+7 -7
+3 -3
pkgs/development/libraries/fastjson/default.nix
··· 1 1 { stdenv, fetchFromGitHub, libtool, autoconf, automake }: 2 2 3 3 stdenv.mkDerivation rec { 4 - version = "v0.99.2"; 4 + version = "v0.99.4"; 5 5 name = "fastjson-${version}"; 6 6 src = fetchFromGitHub { 7 7 repo = "libfastjson"; 8 8 owner = "rsyslog"; 9 - rev = "eabae907c9d991143e17da278a239819f2e8ae1c"; 10 - sha256 = "17fhaqdn0spc4p0848ahcy68swm6l5yd3bx6bdzxmmwj1jdrmvzk"; 9 + rev = "6e057a094cb225c9d80d8d6e6b1f36ca88a942dd"; 10 + sha256 = "1pn207p9zns0aqm6z5l5fdgb94wyyhaw83lyvyfdxmai74nbqs65"; 11 11 }; 12 12 13 13 buildInputs = [ autoconf automake libtool ];
+2 -2
pkgs/development/libraries/librelp/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, gnutls, zlib }: 2 2 3 3 stdenv.mkDerivation rec { 4 - name = "librelp-1.2.8"; 4 + name = "librelp-1.2.12"; 5 5 6 6 src = fetchurl { 7 7 url = "http://download.rsyslog.com/librelp/${name}.tar.gz"; 8 - sha256 = "1qxj7isa2d10aw6c4a9pd3fx08vv06rrhac312avgcjmdqaa88r6"; 8 + sha256 = "1mvvxqfsfg96rb6xv3fw7mcsqmyfnsb74sc53gnhpcpp4h2p6m83"; 9 9 }; 10 10 11 11 buildInputs = [ pkgconfig gnutls zlib ];
+2 -2
pkgs/tools/system/rsyslog/default.nix
··· 11 11 mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}"; 12 12 in 13 13 stdenv.mkDerivation rec { 14 - name = "rsyslog-8.17.0"; 14 + name = "rsyslog-8.21.0"; 15 15 16 16 src = fetchurl { 17 17 url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz"; 18 - sha256 = "1fazpbllr3wk8aw41zk7b6iirds4h8j3im080nf8my2cjssij7pc"; 18 + sha256 = "1arrhc9fw79sp7dxkf7gyfwibyr2i1000pfds5c7n43mgglgvcdx"; 19 19 }; 20 20 21 21 #patches = [ ./fix-gnutls-detection.patch ];