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

pmacct: 1.7.6 -> 1.7.7

pkgs/tools/networking/pmacct/default.nix

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