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

pmacct: 1.7.5 -> 1.7.6

pkgs/development/libraries/libcdada/default.nix

@@ -0,0 +1,37 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "libcdada";
+  version = "0.3.5";
+
+  src = fetchFromGitHub {
+    owner = "msune";
+    repo = "libcdada";
+    rev = "v${version}";
+    sha256 = "0vcsf3s4fbw2w33jjc8b509kc0xb6ld58l8wfxgqwjqx5icfg1ps";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  configureFlags = [
+    "--without-tests"
+    "--without-examples"
+  ];
+
+  meta = with lib; {
+    description = "Library for basic data structures in C";
+    longDescription = ''
+      Basic data structures in C: list, set, map/hashtable, queue... (libstdc++ wrapper)
+    '';
+    homepage = "https://github.com/msune/libcdada";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ _0x4A6F ];
+    platforms = platforms.unix;
+  };
+}

pkgs/tools/networking/pmacct/default.nix

@@ -1,55 +1,56 @@
-{ lib, stdenv
+{ lib
+, stdenv
 , fetchFromGitHub
 , pkg-config
 , autoreconfHook
 , libtool
 , libpcap
-
+, libcdada
 # Optional Dependencies
-, zlib ? null
+, withJansson ? true, jansson
-, withJansson ? true, jansson ? null
+, withNflog ? true, libnetfilter_log
-, withNflog ? true, libnetfilter_log ? null
+, withSQLite ? true, sqlite
-, withSQLite ? true, sqlite ? null
+, withPgSQL ? true, postgresql
-, withPgSQL ? true, postgresql ? null
+, withMysql ? true, libmysqlclient, zlib
-, withMysql ? true, libmysqlclient ? null }:
+, gnutlsSupport ? false, gnutls
-
+}:
-assert withJansson -> jansson != null;
-assert withNflog -> libnetfilter_log != null;
-assert withSQLite -> sqlite != null;
-assert withPgSQL -> postgresql != null;
-assert withMysql -> libmysqlclient != null;
-
-let inherit (lib) getDev optional optionalString; in
 
 stdenv.mkDerivation rec {
-  version = "1.7.5";
+  version = "1.7.6";
   pname = "pmacct";
 
   src = fetchFromGitHub {
     owner = "pmacct";
-    repo = pname;
+    repo = "pmacct";
     rev = "v${version}";
-    sha256 = "17p5isrq5w58hvmzhc6akbd37ins3c95g0rvhhdm0v33khzxmran";
+    sha256 = "0x1i75hwz44siqvn4i58jgji0zwrqgn6ayv89s9m9nh3b423nsiv";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkg-config libtool ];
+  nativeBuildInputs = [
-  buildInputs = [ libpcap ]
+    autoreconfHook
-    ++ optional withJansson jansson
+    pkg-config
-    ++ optional withNflog libnetfilter_log
+    libtool
-    ++ optional withSQLite sqlite
+  ];
-    ++ optional withPgSQL postgresql
+  buildInputs = [
-    ++ optional withMysql [ libmysqlclient zlib ];
+    libcdada
+    libpcap
+  ] ++ lib.optional withJansson jansson
+  ++ lib.optional withNflog libnetfilter_log
+  ++ lib.optional withSQLite sqlite
+  ++ lib.optional withPgSQL postgresql
+  ++ lib.optionals withMysql [ libmysqlclient zlib ]
+  ++ lib.optional gnutlsSupport gnutls;
 
-  MYSQL_CONFIG =
+  MYSQL_CONFIG = lib.optionalString withMysql "${lib.getDev libmysqlclient}/bin/mysql_config";
-    optionalString withMysql "${getDev libmysqlclient}/bin/mysql_config";
 
   configureFlags = [
     "--with-pcap-includes=${libpcap}/include"
-  ] ++ optional withJansson "--enable-jansson"
+  ] ++ lib.optional withJansson "--enable-jansson"
-    ++ optional withNflog "--enable-nflog"
+  ++ lib.optional withNflog "--enable-nflog"
-    ++ optional withSQLite "--enable-sqlite3"
+  ++ lib.optional withSQLite "--enable-sqlite3"
-    ++ optional withPgSQL "--enable-pgsql"
+  ++ lib.optional withPgSQL "--enable-pgsql"
-    ++ optional withMysql "--enable-mysql";
+  ++ lib.optional withMysql "--enable-mysql"
+  ++ lib.optional gnutlsSupport "--enable-gnutls";
 
   meta = with lib; {
     description = "A small set of multi-purpose passive network monitoring tools";

pkgs/top-level/all-packages.nix

@@ -16954,6 +16954,8 @@ with pkgs;
 
   libcerf = callPackage ../development/libraries/libcerf {};
 
+  libcdada = callPackage ../development/libraries/libcdada { };
+
   libcdaudio = callPackage ../development/libraries/libcdaudio { };
 
   libcddb = callPackage ../development/libraries/libcddb { };