From 47ccc24b0afa63f555279feb3e57d3e6538301c1 Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Tue, 14 Feb 2023 14:53:04 +0100 Subject: [PATCH] netdata: 1.37.1 -> 1.38.1 --- pkgs/tools/system/netdata/default.nix | 5 +++-- .../system/netdata/no-files-in-etc-and-var.patch | 12 ++---------- .../system/netdata/skip-CONFIGURE_COMMAND.patch | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index a84113fe20ba..5f24ddf62609 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -17,14 +17,15 @@ let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.37.1"; + # Don't forget to update go.d.plugin.nix as well + version = "1.38.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-SsrdjFENPkI7Ed1gKt28sygJ5NgZ5un+5baIQ3Kv7yE="; + sha256 = "sha256-y+rjqS95JS1PU+iR8c7spcg1UoYCjpzbpunTAgTJ35U="; fetchSubmodules = true; }; diff --git a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index 0daaf6ee7ed3..44d0063414e2 100644 --- a/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -2,7 +2,7 @@ diff --git a/collectors/Makefile.am b/collectors/Makefile.am index a0a972e8f..b4a2a5f53 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am -@@ -32,7 +32,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d +@@ -30,7 +30,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d # Explicitly install directories to avoid permission issues due to umask @@ -78,15 +78,7 @@ diff --git a/system/Makefile.am b/system/Makefile.am index a88ccab65..bda6ee2b6 100644 --- a/system/Makefile.am +++ b/system/Makefile.am -@@ -3,7 +3,6 @@ - - MAINTAINERCLEANFILES = $(srcdir)/Makefile.in - CLEANFILES = \ -- edit-config \ - netdata-openrc \ - netdata.logrotate \ - netdata.service \ -@@ -20,15 +19,13 @@ include $(top_srcdir)/build/subst.inc +@@ -19,15 +19,13 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in dist_config_SCRIPTS = \ diff --git a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch index fa7a0e7ad9c2..a03593896d96 100644 --- a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch +++ b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch @@ -3,7 +3,7 @@ Shrink closure size by avoiding paths embedded from configure call. https://github.com/NixOS/nixpkgs/issues/175693 --- a/daemon/buildinfo.c +++ b/daemon/buildinfo.c -@@ -248,7 +248,9 @@ void print_build_info(void) { +@@ -247,7 +247,9 @@ void print_build_info(void) { char *prebuilt_distro = NULL; get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro);