diff options
| author | Wout Mertens <Wout.Mertens@gmail.com> | 2023-03-01 12:29:07 +0100 |
|---|---|---|
| committer | Wout Mertens <Wout.Mertens@gmail.com> | 2023-03-04 23:38:18 +0100 |
| commit | 5b232943b609b9191c4680de8614554fb1fdb401 (patch) | |
| tree | 84bc47c111e753b1a4a808fec7a63a226eae5e35 /pkgs/tools/system/netdata | |
| parent | 54b1d155046952c41c79bb0a7da834f52effe3b4 (diff) | |
| download | nixlib-5b232943b609b9191c4680de8614554fb1fdb401.tar nixlib-5b232943b609b9191c4680de8614554fb1fdb401.tar.gz nixlib-5b232943b609b9191c4680de8614554fb1fdb401.tar.bz2 nixlib-5b232943b609b9191c4680de8614554fb1fdb401.tar.lz nixlib-5b232943b609b9191c4680de8614554fb1fdb401.tar.xz nixlib-5b232943b609b9191c4680de8614554fb1fdb401.tar.zst nixlib-5b232943b609b9191c4680de8614554fb1fdb401.zip | |
netdata-go-d-plugin: 0.50.0 -> 0.51.2 + expose
Diffstat (limited to 'pkgs/tools/system/netdata')
| -rw-r--r-- | pkgs/tools/system/netdata/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/tools/system/netdata/go.d.plugin.nix | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index d5612331e829..62cb3022d904 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkg-config, makeWrapper , CoreFoundation, IOKit, libossp_uuid , nixosTests +, netdata-go-d-plugin , curl, jemalloc, libuv, zlib , libcap, libuuid, lm_sensors, protobuf , withCups ? false, cups @@ -14,9 +15,7 @@ , withDebug ? false }: -let - go-d-plugin = callPackage ./go.d.plugin.nix {}; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { # Don't forget to update go.d.plugin.nix as well version = "1.38.1"; pname = "netdata"; @@ -70,8 +69,8 @@ in stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = lib.optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; postInstall = '' - ln -s ${go-d-plugin}/lib/netdata/conf.d/* $out/lib/netdata/conf.d - ln -s ${go-d-plugin}/bin/godplugin $out/libexec/netdata/plugins.d/go.d.plugin + 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 '' + lib.optionalString (!stdenv.isDarwin) '' # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 5b45ddbb3ae2..8118a480f3d2 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -1,16 +1,16 @@ { lib, fetchFromGitHub, buildGo119Module }: buildGo119Module rec { - pname = "netdata-go.d.plugin"; - version = "0.50.0"; + pname = "netdata-go-plugins"; + version = "0.51.2"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "5kDc6zszVuFTDkNMuHBRwrfDnH+AdD6ULzmywtvL8iA="; + sha256 = "sha256-u87kTNM1oAmJRtm/iEESjVvQ9qEpFCGqRT8M+iVEwlI="; }; - vendorSha256 = "sha256-Wv6xqzpQxlZCrVnS+g9t1qiYCkm3NfXfW8XDYA9Txxs="; + vendorSha256 = "sha256-QB+Sf7biNPD8/3y9pFxOJZXtc6BaBcQsUGP7y9Wukwg="; doCheck = false; |