dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

netdata: 1.11.1 -> 1.15.0 (#63819)

Browse Source 
netdata: 1.11.1 -> 1.15.0
This commit is contained in:
Jörg Thalheim 2019-06-26 22:06:30 +01:00 committed by GitHub
commit b39f2efa18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 47 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/system/netdata/default.nix
View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, autoreconfHook, pkgconfig, zlib, libuuid, libossp_uuid, CoreFoundation, IOKit, lm_sensors }: { stdenv, fetchurl, autoreconfHook, pkgconfig, zlib, libuuid, libossp_uuid, CoreFoundation, IOKit, lm_sensors }:
stdenv.mkDerivation rec{ stdenv.mkDerivation rec{
version = "1.11.1"; version = "1.15.0";
name = "netdata-${version}"; name = "netdata-${version}";
src = fetchurl { src = fetchurl {
url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz"; url = "https://github.com/netdata/netdata/releases/download/v${version}/netdata-v${version}.tar.gz";
sha256 = "0djph4586cc14vavj6za6k255lscf3b415dx8k45q3nsc2hb4l01"; sha256 = "04frfy08k6m70y3s8j3gvnfnqqd9d5mwj3j6krk9dsh34332abvx";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
@ -20,7 +20,7 @@ stdenv.mkDerivation rec{
postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) '' postInstall = stdenv.lib.optionalString (!stdenv.isDarwin) ''
# rename this plugin so netdata will look for setuid wrapper # rename this plugin so netdata will look for setuid wrapper
mv $out/libexec/netdata/plugins.d/apps.plugin \ mv $out/libexec/netdata/plugins.d/apps.plugin \
$out/libexec/netdata/plugins.d/apps.plugin.org $out/libexec/netdata/plugins.d/apps.plugin.org
''; '';
preConfigure = '' preConfigure = ''

81
pkgs/tools/system/netdata/no-files-in-etc-and-var.patch
View File

@ -1,14 +1,15 @@
diff -ruN orig/Makefile.am new/Makefile.am diff --git a/Makefile.am b/Makefile.am
--- orig/Makefile.am 2018-11-02 08:56:21.000000000 -0500 index f2087bb..7a70cfb 100644
+++ new/Makefile.am 2018-11-16 10:30:22.000000000 -0500 --- a/Makefile.am
@@ -99,10 +99,10 @@ +++ b/Makefile.am
@@ -116,10 +116,10 @@ AM_CFLAGS = \
$(NULL) $(NULL)
sbin_PROGRAMS = sbin_PROGRAMS =
-dist_cache_DATA = installer/.keep -dist_cache_DATA = packaging/installer/.keep
-dist_varlib_DATA = installer/.keep -dist_varlib_DATA = packaging/installer/.keep
-dist_registry_DATA = installer/.keep -dist_registry_DATA = packaging/installer/.keep
-dist_log_DATA = installer/.keep -dist_log_DATA = packaging/installer/.keep
+dist_cache_DATA = +dist_cache_DATA =
+dist_varlib_DATA = +dist_varlib_DATA =
+dist_registry_DATA = +dist_registry_DATA =
@ -16,64 +17,70 @@ diff -ruN orig/Makefile.am new/Makefile.am
plugins_PROGRAMS = plugins_PROGRAMS =
LIBNETDATA_FILES = \ LIBNETDATA_FILES = \
diff -ruN orig/collectors/charts.d.plugin/Makefile.am new/collectors/charts.d.plugin/Makefile.am diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am
--- orig/collectors/charts.d.plugin/Makefile.am 2018-11-02 08:56:21.000000000 -0500 index 2989b4b..64de7d6 100644
+++ new/collectors/charts.d.plugin/Makefile.am 2018-11-16 11:16:47.000000000 -0500 --- a/collectors/charts.d.plugin/Makefile.am
@@ -32,7 +32,6 @@ +++ b/collectors/charts.d.plugin/Makefile.am
@@ -32,7 +32,6 @@ dist_charts_DATA = \
userchartsconfigdir=$(configdir)/charts.d userchartsconfigdir=$(configdir)/charts.d
dist_userchartsconfig_DATA = \ dist_userchartsconfig_DATA = \
- $(top_srcdir)/installer/.keep \ - .keep \
$(NULL) $(NULL)
chartsconfigdir=$(libconfigdir)/charts.d chartsconfigdir=$(libconfigdir)/charts.d
diff -ruN orig/collectors/node.d.plugin/Makefile.am new/collectors/node.d.plugin/Makefile.am diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am
--- orig/collectors/node.d.plugin/Makefile.am 2018-11-02 08:56:21.000000000 -0500 index 3b5a0a5..b7abe01 100644
+++ new/collectors/node.d.plugin/Makefile.am 2018-11-16 11:16:42.000000000 -0500 --- a/collectors/node.d.plugin/Makefile.am
@@ -23,7 +23,6 @@ +++ b/collectors/node.d.plugin/Makefile.am
@@ -23,7 +23,6 @@ dist_noinst_DATA = \
usernodeconfigdir=$(configdir)/node.d usernodeconfigdir=$(configdir)/node.d
dist_usernodeconfig_DATA = \ dist_usernodeconfig_DATA = \
- $(top_srcdir)/installer/.keep \ - .keep \
$(NULL) $(NULL)
nodeconfigdir=$(libconfigdir)/node.d nodeconfigdir=$(libconfigdir)/node.d
diff -ruN orig/collectors/python.d.plugin/Makefile.am new/collectors/python.d.plugin/Makefile.am diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am
--- orig/collectors/python.d.plugin/Makefile.am 2018-11-02 08:56:21.000000000 -0500 index 652a35d..cf4b2cc 100644
+++ new/collectors/python.d.plugin/Makefile.am 2018-11-16 10:56:06.000000000 -0500 --- a/collectors/python.d.plugin/Makefile.am
@@ -29,7 +29,6 @@ +++ b/collectors/python.d.plugin/Makefile.am
@@ -29,7 +29,6 @@ dist_python_DATA = \
userpythonconfigdir=$(configdir)/python.d userpythonconfigdir=$(configdir)/python.d
dist_userpythonconfig_DATA = \ dist_userpythonconfig_DATA = \
- $(top_srcdir)/installer/.keep \ - .keep \
$(NULL) $(NULL)
pythonconfigdir=$(libconfigdir)/python.d pythonconfigdir=$(libconfigdir)/python.d
diff -ruN orig/collectors/statsd.plugin/Makefile.am new/collectors/statsd.plugin/Makefile.am diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am
--- orig/collectors/statsd.plugin/Makefile.am 2018-11-02 08:56:21.000000000 -0500 index e63bf98..0f59782 100644
+++ new/collectors/statsd.plugin/Makefile.am 2018-11-16 10:53:04.000000000 -0500 --- a/collectors/statsd.plugin/Makefile.am
@@ -15,6 +15,5 @@ +++ b/collectors/statsd.plugin/Makefile.am
@@ -14,6 +14,5 @@ dist_statsdconfig_DATA = \
userstatsdconfigdir=$(configdir)/statsd.d userstatsdconfigdir=$(configdir)/statsd.d
dist_userstatsdconfig_DATA = \ dist_userstatsdconfig_DATA = \
- $(top_srcdir)/installer/.keep \ - .keep \
$(NULL) $(NULL)
diff -ruN orig/health/Makefile.am new/health/Makefile.am diff --git a/health/Makefile.am b/health/Makefile.am
--- orig/health/Makefile.am 2018-11-02 08:56:21.000000000 -0500 index 62a4c6d..4d651df 100644
+++ new/health/Makefile.am 2018-11-16 10:56:30.000000000 -0500 --- a/health/Makefile.am
@@ -16,7 +16,6 @@ +++ b/health/Makefile.am
@@ -16,7 +16,6 @@ dist_noinst_DATA = \
userhealthconfigdir=$(configdir)/health.d userhealthconfigdir=$(configdir)/health.d
dist_userhealthconfig_DATA = \ dist_userhealthconfig_DATA = \
- $(top_srcdir)/installer/.keep \ - .keep \
$(NULL) $(NULL)
healthconfigdir=$(libconfigdir)/health.d healthconfigdir=$(libconfigdir)/health.d
diff -ruN orig/system/Makefile.am new/system/Makefile.am diff --git a/system/Makefile.am b/system/Makefile.am
--- orig/system/Makefile.am 2018-11-02 08:56:21.000000000 -0500 index b085dca..ccfa588 100644
+++ new/system/Makefile.am 2018-11-16 10:29:21.000000000 -0500 --- a/system/Makefile.am
@@ -17,10 +17,6 @@ +++ b/system/Makefile.am
@@ -17,10 +17,6 @@ CLEANFILES = \
include $(top_srcdir)/build/subst.inc include $(top_srcdir)/build/subst.inc
SUFFIXES = .in SUFFIXES = .in