Unverified Commit 45b10f5c authored by Bjørn Forsman's avatar Bjørn Forsman Committed by GitHub
Browse files

Upgrade ntopng to 6.6 (#490337)

parents 22ea2d70 65d934c5
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@

stdenv.mkDerivation (finalAttrs: {
  pname = "ndpi";
  version = "4.10";
  version = "5.0";

  src = fetchFromGitHub {
    owner = "ntop";
    repo = "nDPI";
    tag = finalAttrs.version;
    hash = "sha256-iXqvDMJsOXcg9YkqKFgInLLfH6j/HEp4bEaIl6dpVtc=";
    hash = "sha256-Elnj6qDuT8UWDxmasiHOt5DxC7GcH5zgrp3J3LYcl0c=";
  };

  nativeBuildInputs = [
+5 −2
Original line number Diff line number Diff line
@@ -23,17 +23,18 @@
  sqlite,
  which,
  zeromq,
  cmake,
}:

stdenv.mkDerivation (finalAttrs: {
  pname = "ntopng";
  version = "6.2";
  version = "6.6";

  src = fetchFromGitHub {
    owner = "ntop";
    repo = "ntopng";
    tag = finalAttrs.version;
    hash = "sha256-8PG18mOV/6EcBpKt9kLyI40OLDnpnc2b4IUu9JbK/Co=";
    hash = "sha256-BYJtsEuxmo6jzqCoC/A5vDAiFSGqy8XFyqooGDTZE40=";
    fetchSubmodules = true;
  };

@@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
    git
    pkg-config
    which
    cmake
  ];

  buildInputs = [
@@ -91,6 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
    cp -r doc/README.geolocation.md "$out/share/ntopng/doc/"
  '';

  dontUseCmakeConfigure = true;
  enableParallelBuilding = true;

  meta = {