Merge pull request #174290 from Izorkin/update-netdata
netdata: 1.33.1 -> 1.34.1
This commit is contained in:
commit
c282caf4ba
@ -16,14 +16,14 @@ with lib;
|
|||||||
let
|
let
|
||||||
go-d-plugin = callPackage ./go.d.plugin.nix {};
|
go-d-plugin = callPackage ./go.d.plugin.nix {};
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
version = "1.33.1";
|
version = "1.34.1";
|
||||||
pname = "netdata";
|
pname = "netdata";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "netdata";
|
owner = "netdata";
|
||||||
repo = "netdata";
|
repo = "netdata";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-4rx8EHtOSd/lHcSHZCtiXkjJjL7B175cVGvFOZ9Bzi8=";
|
sha256 = "sha256-MGXHIbmoPRyjjYHV/RD9sd8Dn74YVlET2V3d/wJ3blo=";
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -49,8 +49,6 @@ in stdenv.mkDerivation rec {
|
|||||||
# Therefore we put it into `/run/netdata`, which is owned
|
# Therefore we put it into `/run/netdata`, which is owned
|
||||||
# by netdata only.
|
# by netdata only.
|
||||||
./ipc-socket-in-run.patch
|
./ipc-socket-in-run.patch
|
||||||
# This is only needed for 1.33.1, remove on the next release
|
|
||||||
./fix-protobuf.patch
|
|
||||||
];
|
];
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
|
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c
|
|
||||||
index b64a78f29..ccd1c884d 100644
|
|
||||||
--- a/daemon/buildinfo.c
|
|
||||||
+++ b/daemon/buildinfo.c
|
|
||||||
@@ -60,7 +60,6 @@
|
|
||||||
// Optional libraries
|
|
||||||
|
|
||||||
#ifdef HAVE_PROTOBUF
|
|
||||||
-#if defined(ACLK_NG) || defined(ENABLE_PROMETHEUS_REMOTE_WRITE)
|
|
||||||
#define FEAT_PROTOBUF 1
|
|
||||||
#ifdef BUNDLED_PROTOBUF
|
|
||||||
#define FEAT_PROTOBUF_BUNDLED " (bundled)"
|
|
||||||
@@ -71,10 +70,6 @@
|
|
||||||
#define FEAT_PROTOBUF 0
|
|
||||||
#define FEAT_PROTOBUF_BUNDLED ""
|
|
||||||
#endif
|
|
||||||
-#else
|
|
||||||
-#define FEAT_PROTOBUF 0
|
|
||||||
-#define FEAT_PROTOBUF_BUNDLED ""
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
#ifdef ENABLE_JSONC
|
|
||||||
#define FEAT_JSONC 1
|
|
@ -2,16 +2,16 @@
|
|||||||
|
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
pname = "netdata-go.d.plugin";
|
pname = "netdata-go.d.plugin";
|
||||||
version = "0.31.0";
|
version = "0.32.3";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "netdata";
|
owner = "netdata";
|
||||||
repo = "go.d.plugin";
|
repo = "go.d.plugin";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-wS8+C03K/qn8zKIAQvZ7nF7CmFfIvKU/dtm80bTeniM=";
|
sha256 = "sha256-SayFqr6n6OLLUXseYiR8iBIf2xeDEHXHD0qBrgHY6+o=";
|
||||||
};
|
};
|
||||||
|
|
||||||
vendorSha256 = "sha256-17/f6tAxDD5TgjmwnqAlnQSxDhnFidjsN55/sUMDej8=";
|
vendorSha256 = "sha256-tIuHWfAjvr5s2nJSnhnMZIjyy77BbobwgQoDOy4gdGI=";
|
||||||
|
|
||||||
doCheck = false;
|
doCheck = false;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user