Unverified Commit 58df6c28 authored by Florian's avatar Florian Committed by GitHub
Browse files

Merge pull request #330953 from r-ryantm/auto-update/rrdtool 

rrdtool: 1.8.0 -> 1.9.0
parents a69fe54c df7033b5

pkgs/by-name/rr/rrdtool/package.nix

0 → 100644
+69 −0
Original line number Diff line number Diff line 
{

  lib,

  stdenv,

  fetchFromGitHub,

  fetchpatch,

  autoreconfHook,

  gettext,

  perl,

  pkg-config,

  libxml2,

  pango,

  cairo,

  groff,

  tcl,

  darwin,

}:



perl.pkgs.toPerlModule (

  stdenv.mkDerivation rec {

    pname = "rrdtool";

    version = "1.9.0";



    src = fetchFromGitHub {

      owner = "oetiker";

      repo = "rrdtool-1.x";

      rev = "v${version}";

      hash = "sha256-CPbSu1mosNlfj2nqiNVH14a5C5njkfvJM8ix3X3aP8E=";

    };



    # Fix darwin build

    patches = lib.optional stdenv.isDarwin (fetchpatch {

      url = "https://github.com/oetiker/rrdtool-1.x/pull/1262.patch";

      hash = "sha256-aP0rmDlILn6VC8Tg7HpRXbxL9+KD/PRTbXnbQ7HgPEg=";

    });



    nativeBuildInputs = [

      pkg-config

      autoreconfHook

    ];



    buildInputs =

      [

        gettext

        perl

        libxml2

        pango

        cairo

        groff

      ]

      ++ lib.optionals stdenv.isDarwin [

        tcl

        darwin.apple_sdk.frameworks.ApplicationServices

      ];



    postInstall = ''

      # for munin and rrdtool support

      mkdir -p $out/${perl.libPrefix}

      mv $out/lib/perl/5* $out/${perl.libPrefix}

    '';



    meta = with lib; {

      homepage = "https://oss.oetiker.ch/rrdtool/";

      description = "High performance logging in Round Robin Databases";

      license = licenses.gpl2Only;

      platforms = platforms.linux ++ platforms.darwin;

      maintainers = with maintainers; [ pSub ];

    };

  }

)

pkgs/tools/misc/kcollectd/default.nix

+21 −16
Original line number Diff line number Diff line 
{ lib

, fetchFromGitLab

, mkDerivation

, qtbase

, cmake

, kconfig

, kio

, kiconthemes

, kxmlgui

, ki18n

, kguiaddons

, extra-cmake-modules

, boost

, shared-mime-info

, rrdtool

, breeze-icons

{

  lib,

  fetchFromGitLab,

  mkDerivation,

  qtbase,

  cmake,

  kconfig,

  kio,

  kiconthemes,

  kxmlgui,

  ki18n,

  kguiaddons,

  extra-cmake-modules,

  boost,

  shared-mime-info,

  rrdtool,

  breeze-icons,

}:



mkDerivation rec {
@@ -26,6 +27,10 @@ mkDerivation rec { 
    hash = "sha256-bUVL5eRQ5UkSZo562pnyEcj0fVoSC5WHRq4BfN67jEM=";

  };



  postPatch = lib.optional (!lib.versionOlder rrdtool.version "1.9.0") ''

    substituteInPlace kcollectd/rrd_interface.cc --replace-fail 'char *arg[] =' 'const char *arg[] ='

  '';



  nativeBuildInputs = [

    cmake

    extra-cmake-modules

pkgs/tools/misc/rrdtool/default.nix

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, autoreconfHook

, gettext

, perl

, pkg-config

, libxml2

, pango

, cairo

, groff

, tcl

, darwin

}:



perl.pkgs.toPerlModule (stdenv.mkDerivation rec {

  pname = "rrdtool";

  version = "1.8.0";



  src = fetchFromGitHub {

    owner = "oetiker";

    repo = "rrdtool-1.x";

    rev = "v${version}";

    hash = "sha256-a+AxU1+YpkGoFs1Iu/CHAEZ4XIkWs7Vsnr6RcfXzsBE=";

  };



  nativeBuildInputs = [

    pkg-config

    autoreconfHook

  ];



  buildInputs = [ gettext perl libxml2 pango cairo groff ]

    ++ lib.optionals stdenv.isDarwin [ tcl darwin.apple_sdk.frameworks.ApplicationServices ];



  postInstall = ''

    # for munin and rrdtool support

    mkdir -p $out/${perl.libPrefix}

    mv $out/lib/perl/5* $out/${perl.libPrefix}

  '';



  meta = with lib; {

    homepage = "https://oss.oetiker.ch/rrdtool/";

    description = "High performance logging in Round Robin Databases";

    license = licenses.gpl2Only;

    platforms = platforms.linux ++ platforms.darwin;

    maintainers = with maintainers; [ pSub ];

  };

})

pkgs/tools/networking/ntopng/default.nix

+31 −24
Original line number Diff line number Diff line 
{ lib

, stdenv

, autoreconfHook

, curl

, expat

, fetchFromGitHub

, git

, json_c

, libcap

, libmaxminddb

, libmysqlclient

, libpcap

, libsodium

, ndpi

, net-snmp

, openssl

, pkg-config

, rdkafka

, gtest

, rrdtool

, hiredis

, sqlite

, which

, zeromq

{

  lib,

  stdenv,

  autoreconfHook,

  curl,

  expat,

  fetchFromGitHub,

  fetchpatch,

  git,

  json_c,

  libcap,

  libmaxminddb,

  libmysqlclient,

  libpcap,

  libsodium,

  ndpi,

  net-snmp,

  openssl,

  pkg-config,

  rdkafka,

  gtest,

  rrdtool,

  hiredis,

  sqlite,

  which,

  zeromq,

}:



stdenv.mkDerivation (finalAttrs: {
@@ -36,6 +38,11 @@ stdenv.mkDerivation (finalAttrs: { 
    fetchSubmodules = true;

  };



  patches = lib.optional (!lib.versionOlder rrdtool.version "1.9.0") (fetchpatch {

    url = "https://github.com/ntop/ntopng/commit/5069aa4a6259bd0830a33f2ece980612dba5ace9.patch";

    hash = "sha256-CnYzSE39J7pC2wHxp7Xst6g5pzQbpNUynJUVrTrtuOg=";

  });



  preConfigure = ''

    substituteInPlace Makefile.in \

      --replace "/bin/rm" "rm"

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -12295,8 +12295,6 @@ with pkgs; 














  rpmextract = callPackage ../tools/archivers/rpmextract { };



























  rrdtool = callPackage ../tools/misc/rrdtool { };



























  rscw = callPackage ../applications/radio/rscw { };





























  rset = callPackage ../tools/admin/rset { };