mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 20:39:04 +02:00
Merge pull request #216313 from wmertens/netdata-138
This commit is contained in:
commit
1b7d196aa5
|
@ -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;
|
||||
};
|
||||
|
||||
|
|
|
@ -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 = \
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue