From 6c9d467e03e5b9288146351382f78b96fb1e6382 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 29 Jul 2024 22:35:06 +0000 Subject: [PATCH 1/7] rrdtool: 1.8.0 -> 1.9.0 --- pkgs/tools/misc/rrdtool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 3ce10f131605..a96a74fedd92 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -15,13 +15,13 @@ perl.pkgs.toPerlModule (stdenv.mkDerivation rec { pname = "rrdtool"; - version = "1.8.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "oetiker"; repo = "rrdtool-1.x"; rev = "v${version}"; - hash = "sha256-a+AxU1+YpkGoFs1Iu/CHAEZ4XIkWs7Vsnr6RcfXzsBE="; + hash = "sha256-CPbSu1mosNlfj2nqiNVH14a5C5njkfvJM8ix3X3aP8E="; }; nativeBuildInputs = [ From edadd232787174942206758cde66332a89f205f7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Aug 2024 14:01:52 +0200 Subject: [PATCH 2/7] rrdtool: add patch to fix darwin build --- pkgs/tools/misc/rrdtool/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index a96a74fedd92..48af0a0c062b 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , gettext , perl @@ -24,6 +25,12 @@ perl.pkgs.toPerlModule (stdenv.mkDerivation rec { 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 From 217ef850917a925061d787d349c48e199fc12a08 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Aug 2024 14:02:23 +0200 Subject: [PATCH 3/7] rrdtool: reformat --- pkgs/tools/misc/rrdtool/default.nix | 108 ++++++++++++++++------------ 1 file changed, 61 insertions(+), 47 deletions(-) diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 48af0a0c062b..733b981e4247 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -1,55 +1,69 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, autoreconfHook -, gettext -, perl -, pkg-config -, libxml2 -, pango -, cairo -, groff -, tcl -, darwin +{ + 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"; +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="; - }; + 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="; - }); + # 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 - ]; + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; - buildInputs = [ gettext perl libxml2 pango cairo groff ] - ++ lib.optionals stdenv.isDarwin [ tcl darwin.apple_sdk.frameworks.ApplicationServices ]; + 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} - ''; + 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 ]; - }; -}) + 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 ]; + }; + } +) From 06b5913157598d1c496aa3f99f2f98e4f5cf3212 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Aug 2024 14:03:42 +0200 Subject: [PATCH 4/7] rrdtool: move to by-name --- .../misc/rrdtool/default.nix => by-name/rr/rrdtool/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/misc/rrdtool/default.nix => by-name/rr/rrdtool/package.nix} (100%) diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/by-name/rr/rrdtool/package.nix similarity index 100% rename from pkgs/tools/misc/rrdtool/default.nix rename to pkgs/by-name/rr/rrdtool/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0ba6d69d88b..a09fa7932fee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12343,8 +12343,6 @@ with pkgs; rpmextract = callPackage ../tools/archivers/rpmextract { }; - rrdtool = callPackage ../tools/misc/rrdtool { }; - rscw = callPackage ../applications/radio/rscw { }; rset = callPackage ../tools/admin/rset { }; From 1f21ddd4a5a1751fd12f685f47eb5e2bcf433894 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Aug 2024 14:23:39 +0200 Subject: [PATCH 5/7] kcollectd: fix build with rrdtool >= 1.9.0 --- pkgs/tools/misc/kcollectd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/misc/kcollectd/default.nix b/pkgs/tools/misc/kcollectd/default.nix index c61ff5f3d72b..5a98bd8e1e93 100644 --- a/pkgs/tools/misc/kcollectd/default.nix +++ b/pkgs/tools/misc/kcollectd/default.nix @@ -26,6 +26,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 From b0cc0cf092345965366392f52d33a3dfffaae9b1 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Aug 2024 14:26:31 +0200 Subject: [PATCH 6/7] kcollectd: reformat --- pkgs/tools/misc/kcollectd/default.nix | 33 ++++++++++++++------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/misc/kcollectd/default.nix b/pkgs/tools/misc/kcollectd/default.nix index 5a98bd8e1e93..86fb2628866d 100644 --- a/pkgs/tools/misc/kcollectd/default.nix +++ b/pkgs/tools/misc/kcollectd/default.nix @@ -1,19 +1,20 @@ -{ 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 { From df7033b5c425766e2565e12dbae17c632abb1256 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 6 Aug 2024 14:23:57 +0200 Subject: [PATCH 7/7] ntopng: fix build with rrdtool >= 1.9.0 --- pkgs/tools/networking/ntopng/default.nix | 55 +++++++++++++----------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 18cb68cba407..e29b1a076eda 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,27 +1,29 @@ -{ 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"