From 09116a2377ba3b666fa12bd0f788771e4d81ec7e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 5 Mar 2023 15:15:00 -0500 Subject: [PATCH 1/2] netdata: fix netdata-go-plugins package name --- pkgs/tools/system/netdata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 321b5ab84fa6..fb3d30174b18 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests -, netdata-go-d-plugin +, netdata-go-plugins , bash, curl, jemalloc, libuv, zlib , libcap, libuuid, lm_sensors, protobuf , withCups ? false, cups @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = '' - ln -s ${netdata-go-d-plugin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d - ln -s ${netdata-go-d-plugin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin + ln -s ${netdata-go-plugins}/lib/netdata/conf.d/* $out/lib/netdata/conf.d + ln -s ${netdata-go-plugins}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin '' + lib.optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ From e692221d561def64d82e33394d695010b6462b6f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 5 Mar 2023 15:15:00 -0500 Subject: [PATCH 2/2] netdata-go-plugins: use default buildGoModule netdata-go-plugins >=0.51.1 supports Go 1.20 https://github.com/netdata/go.d.plugin/commit/be7abea20e49067b1042ed312d304e6cdb88cae1 --- pkgs/tools/system/netdata/go.d.plugin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 8118a480f3d2..dd3b52eca66e 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -1,5 +1,5 @@ -{ lib, fetchFromGitHub, buildGo119Module }: -buildGo119Module rec { +{ lib, fetchFromGitHub, buildGoModule }: +buildGoModule rec { pname = "netdata-go-plugins"; version = "0.51.2";