diff --git a/pkgs/by-name/li/liblognorm/package.nix b/pkgs/by-name/li/liblognorm/package.nix index c6feb49595e9..5211eaf7e93c 100644 --- a/pkgs/by-name/li/liblognorm/package.nix +++ b/pkgs/by-name/li/liblognorm/package.nix @@ -1,34 +1,48 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, pkg-config, libestr, json_c, - pcre, + pcre2, libfastjson, }: stdenv.mkDerivation (finalAttrs: { pname = "liblognorm"; - version = "2.0.9"; + version = "2.1.0"; - src = fetchurl { - url = "https://www.liblognorm.com/files/download/liblognorm-${finalAttrs.version}.tar.gz"; - hash = "sha256-dsfMLLdqPVjncy4M/yORgPg/O2NQAriqBIZciBKFd5M="; + src = fetchFromGitHub { + owner = "rsyslog"; + repo = "liblognorm"; + tag = "v${finalAttrs.version}"; + hash = "sha256-XHfTSLYjfGRNmPUQrLWK+Co4v4cCmtfhZ0wruAC0RNI="; }; - nativeBuildInputs = [ pkg-config ]; + postPatch = '' + patchShebangs tests/*.sh + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ libestr json_c - pcre + pcre2 libfastjson ]; configureFlags = [ "--enable-regexp" ]; + doCheck = true; + meta = { + changelog = "https://github.com/rsyslog/liblognorm/blob/${finalAttrs.src.tag}/ChangeLog"; description = "Help to make sense out of syslog data, or, actually, any event data that is present in text form"; homepage = "https://www.liblognorm.com/"; license = lib.licenses.lgpl21;