Merge pull request #162819 from 0x4A6F/master-pmacct

pmacct: 1.7.6 -> 1.7.7
This commit is contained in:
Lassulus 2022-04-09 09:02:51 +01:00 committed by GitHub
commit 0a01c3790b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -11,19 +11,21 @@
, withNflog ? true, libnetfilter_log , withNflog ? true, libnetfilter_log
, withSQLite ? true, sqlite , withSQLite ? true, sqlite
, withPgSQL ? true, postgresql , withPgSQL ? true, postgresql
, withMysql ? true, libmysqlclient, zlib , withMysql ? true, libmysqlclient, zlib, numactl
, gnutlsSupport ? false, gnutls , gnutlsSupport ? false, gnutls
, testVersion
, pmacct
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.7.6"; version = "1.7.7";
pname = "pmacct"; pname = "pmacct";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pmacct"; owner = "pmacct";
repo = "pmacct"; repo = "pmacct";
rev = "v${version}"; rev = "v${version}";
sha256 = "0x1i75hwz44siqvn4i58jgji0zwrqgn6ayv89s9m9nh3b423nsiv"; sha256 = "1pjaa44qj3y5dfwsd1a9r7a4riy7afza8phx2npcsyyarssxc63w";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -38,7 +40,7 @@ stdenv.mkDerivation rec {
++ lib.optional withNflog libnetfilter_log ++ lib.optional withNflog libnetfilter_log
++ lib.optional withSQLite sqlite ++ lib.optional withSQLite sqlite
++ lib.optional withPgSQL postgresql ++ lib.optional withPgSQL postgresql
++ lib.optionals withMysql [ libmysqlclient zlib ] ++ lib.optionals withMysql [ libmysqlclient zlib numactl ]
++ lib.optional gnutlsSupport gnutls; ++ lib.optional gnutlsSupport gnutls;
MYSQL_CONFIG = lib.optionalString withMysql "${lib.getDev libmysqlclient}/bin/mysql_config"; MYSQL_CONFIG = lib.optionalString withMysql "${lib.getDev libmysqlclient}/bin/mysql_config";
@ -52,6 +54,10 @@ stdenv.mkDerivation rec {
++ lib.optional withMysql "--enable-mysql" ++ lib.optional withMysql "--enable-mysql"
++ lib.optional gnutlsSupport "--enable-gnutls"; ++ lib.optional gnutlsSupport "--enable-gnutls";
passthru.tests = {
version = testVersion { package = pmacct; command = "pmacct -V"; };
};
meta = with lib; { meta = with lib; {
description = "A small set of multi-purpose passive network monitoring tools"; description = "A small set of multi-purpose passive network monitoring tools";
longDescription = '' longDescription = ''
@ -59,6 +65,7 @@ stdenv.mkDerivation rec {
[NetFlow IPFIX sFlow libpcap BGP BMP RPKI IGP Streaming Telemetry] [NetFlow IPFIX sFlow libpcap BGP BMP RPKI IGP Streaming Telemetry]
''; '';
homepage = "http://www.pmacct.net/"; homepage = "http://www.pmacct.net/";
changelog = "https://github.com/pmacct/pmacct/blob/v${version}/ChangeLog";
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ _0x4A6F ]; maintainers = with maintainers; [ _0x4A6F ];
platforms = platforms.unix; platforms = platforms.unix;