diff options
| author | Izorkin <izorkin@elven.pw> | 2022-05-24 14:23:19 +0300 |
|---|---|---|
| committer | Izorkin <izorkin@elven.pw> | 2022-05-24 20:05:35 +0300 |
| commit | 2ab4d2f39e05ff5250bcdcbd97f41ec81b4d320b (patch) | |
| tree | f11fcbedbe86b1c405e8db50fbb812f4f2e7e928 | |
| parent | a77280ef85ba5af5bfbac0c1fb5000988d7b8943 (diff) | |
| download | nixpkgs-2ab4d2f39e05ff5250bcdcbd97f41ec81b4d320b.tar nixpkgs-2ab4d2f39e05ff5250bcdcbd97f41ec81b4d320b.tar.gz nixpkgs-2ab4d2f39e05ff5250bcdcbd97f41ec81b4d320b.tar.bz2 nixpkgs-2ab4d2f39e05ff5250bcdcbd97f41ec81b4d320b.tar.lz nixpkgs-2ab4d2f39e05ff5250bcdcbd97f41ec81b4d320b.tar.xz nixpkgs-2ab4d2f39e05ff5250bcdcbd97f41ec81b4d320b.tar.zst nixpkgs-2ab4d2f39e05ff5250bcdcbd97f41ec81b4d320b.zip | |
netdata: 1.33.1 -> 1.34.1
| -rw-r--r-- | pkgs/tools/system/netdata/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/system/netdata/fix-protobuf.patch | 23 |
2 files changed, 2 insertions, 27 deletions
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index c9e93d42738..0d396893d11 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -16,14 +16,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.33.1"; + version = "1.34.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-4rx8EHtOSd/lHcSHZCtiXkjJjL7B175cVGvFOZ9Bzi8="; + sha256 = "sha256-MGXHIbmoPRyjjYHV/RD9sd8Dn74YVlET2V3d/wJ3blo="; fetchSubmodules = true; }; @@ -49,8 +49,6 @@ in stdenv.mkDerivation rec { # Therefore we put it into `/run/netdata`, which is owned # by netdata only. ./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"; diff --git a/pkgs/tools/system/netdata/fix-protobuf.patch b/pkgs/tools/system/netdata/fix-protobuf.patch deleted file mode 100644 index 963e307ec77..00000000000 --- a/pkgs/tools/system/netdata/fix-protobuf.patch +++ /dev/null @@ -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 |