diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 1ccb04789f0e..6c89a3d2e559 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { # Don't forget to update go.d.plugin.nix as well - version = "1.40.1"; + version = "1.41.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-4bYCsEeB0kEYtVFVXymFv7ELUo9RXoKbPjOlDKav8Rg="; + sha256 = "sha256-MZQ1ZTghH4bN7kCMqbyQlAGSgE70sYJxjiamTTH/6ds="; fetchSubmodules = true; }; @@ -49,11 +49,6 @@ stdenv.mkDerivation rec { # required to prevent plugins from relying on /etc # and /var ./no-files-in-etc-and-var.patch - # The current IPC location is unsafe as it writes - # a fixed path in /tmp, which is world-writable. - # Therefore we put it into `/run/netdata`, which is owned - # by netdata only. - ./ipc-socket-in-run.patch # Avoid build-only inputs in closure leaked by configure command: # https://github.com/NixOS/nixpkgs/issues/175693#issuecomment-1143344162 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 3a05d3bbf87b..6e24d707d0ae 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 @@ -1,8 +1,8 @@ diff --git a/collectors/Makefile.am b/collectors/Makefile.am -index 24e4c3f09..b3c354943 100644 +index 2aec3dd3e..27385ec28 100644 --- a/collectors/Makefile.am +++ b/collectors/Makefile.am -@@ -30,7 +30,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d +@@ -31,7 +31,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d # Explicitly install directories to avoid permission issues due to umask @@ -62,7 +62,7 @@ index c8144c137..f8aaa89b6 100644 +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) diff --git a/health/Makefile.am b/health/Makefile.am -index ea1b6e961..071fdd564 100644 +index 20e000860..add0137b3 100644 --- a/health/Makefile.am +++ b/health/Makefile.am @@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ @@ -75,10 +75,10 @@ index ea1b6e961..071fdd564 100644 healthconfigdir=$(libconfigdir)/health.d diff --git a/system/Makefile.am b/system/Makefile.am -index 13466639d..e7cc7acea 100644 +index 54e9278c8..e7cc7acea 100644 --- a/system/Makefile.am +++ b/system/Makefile.am -@@ -21,11 +21,9 @@ include $(top_srcdir)/build/subst.inc +@@ -21,12 +21,9 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in dist_config_SCRIPTS = \ @@ -87,10 +87,11 @@ index 13466639d..e7cc7acea 100644 dist_config_DATA = \ - .install-type \ +- netdata-updater.conf \ $(NULL) libconfigvnodesdir=$(libconfigdir)/vnodes -@@ -45,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit +@@ -46,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit libsyssystemddir=$(libsysdir)/systemd # Explicitly install directories to avoid permission issues due to umask @@ -112,6 +113,3 @@ index be2c545c3..55f373114 100644 $(INSTALL) -d $(DESTDIR)$(usersslconfigdir) dist_noinst_DATA = \ --- -2.40.1 - diff --git a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch index a03593896d96..472da270798f 100644 --- a/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch +++ b/pkgs/tools/system/netdata/skip-CONFIGURE_COMMAND.patch @@ -1,16 +1,16 @@ Shrink closure size by avoiding paths embedded from configure call. https://github.com/NixOS/nixpkgs/issues/175693 +diff --git a/daemon/buildinfo.c b/daemon/buildinfo.c +index 56cde84fc..011e7579d 100644 --- a/daemon/buildinfo.c +++ b/daemon/buildinfo.c -@@ -247,7 +247,9 @@ void print_build_info(void) { - char *prebuilt_distro = NULL; - get_install_type(&install_type, &prebuilt_arch, &prebuilt_distro); +@@ -1040,7 +1040,7 @@ static void build_info_set_status(BUILD_INFO_SLOT slot, bool status) { -- printf("Configure options: %s\n", CONFIGURE_COMMAND); -+ // To minimize closure size do not persist configure options -+ // with build-time inputs. -+ printf("Configure options: REMOVED\n"); + __attribute__((constructor)) void initialize_build_info(void) { + build_info_set_value(BIB_PACKAGING_NETDATA_VERSION, program_version); +- build_info_set_value(BIB_PACKAGING_CONFIGURE_OPTIONS, CONFIGURE_COMMAND); ++ build_info_set_value(BIB_PACKAGING_CONFIGURE_OPTIONS, "REMOVED FOR CLOSURE SIZE REASONS"); - if (install_type == NULL) { - printf("Install type: unknown\n"); + #ifdef COMPILED_FOR_LINUX + build_info_set_status(BIB_FEATURE_BUILT_FOR, true);