Merge pull request #284855 from ajs124/upd/ntopng

ntopng: 5.6 -> 6.0

pkgs/development/libraries/ndpi/default.nix

@@ -1,7 +1,6 @@
 { lib
 , stdenv
-, autoconf
-, automake
+, autoreconfHook
 , fetchFromGitHub
 , json_c
 , libpcap
@@ -10,22 +9,19 @@
 , which
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ndpi";
-  version = "4.6";
+  version = "4.8";
 
   src = fetchFromGitHub {
     owner = "ntop";
     repo = "nDPI";
-    rev = "refs/tags/${version}";
-    hash = "sha256-S0lVh5FZewPbYG/1ikI2RroCSC7OI8Xmfeq73hYCHnY=";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-V3hRDQ141pbR5jJK2QlP7BF2CEbuzqIvo+iTx3EGhRY=";
   };
 
-  configureScript = "./autogen.sh";
-
   nativeBuildInputs = [
-    autoconf
-    automake
+    autoreconfHook
     libtool
     pkg-config
     which
@@ -42,10 +38,10 @@ stdenv.mkDerivation rec {
       nDPI is a library for deep-packet inspection based on OpenDPI.
     '';
     homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/";
-    changelog = "https://github.com/ntop/nDPI/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/ntop/nDPI/blob/${finalAttrs.version}/CHANGELOG.md";
     license = with licenses; [ lgpl3Plus bsd3 ];
     maintainers = with maintainers; [ takikawa ];
     mainProgram = "ndpiReader";
     platforms = with platforms; unix;
   };
-}
+})

pkgs/tools/networking/ntopng/default.nix

@@ -24,15 +24,15 @@
 , zeromq
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ntopng";
-  version = "5.6";
+  version = "6.0";
 
   src = fetchFromGitHub {
     owner = "ntop";
     repo = "ntopng";
-    rev = "refs/tags/${version}";
-    hash = "sha256-pIm0C1+4JLVDdXxSaQtd6ON8R2l6KG8ZXuDDuRd6dQI=";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-zLtJ4x1eWtvnd60iNuNkMOX8LinZMEJHSt/Y0FVQ8vw=";
     fetchSubmodules = true;
   };
 
@@ -85,9 +85,9 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "High-speed web-based traffic analysis and flow collection tool";
     homepage = "https://www.ntop.org/products/traffic-analysis/ntop/";
-    changelog = "https://github.com/ntop/ntopng/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/ntop/ntopng/blob/${finalAttrs.version}/CHANGELOG.md";
     license = licenses.gpl3Plus;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ bjornfor ];
   };
-}
+})