diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 28ec7f1be427..13c50fe3ec9e 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig }: +{ stdenv, fetchFromGitHub, autoreconfHook, zlib, pkgconfig, libuuid }: stdenv.mkDerivation rec{ - version = "1.0.0"; + version = "1.4.0"; name = "netdata-${version}"; src = fetchFromGitHub { rev = "v${version}"; owner = "firehol"; repo = "netdata"; - sha256 = "03107ny98zks05p44jzypkk4lw8lbvmqja5b537ln6cnrgp20yvq"; + sha256 = "1wknxci2baj6f7rl8z8j7haaz122jmbb74aw7i3xbj2y61cs58n8"; }; - buildInputs = [ autoreconfHook zlib pkgconfig ]; + buildInputs = [ autoreconfHook zlib pkgconfig libuuid ]; - patches = [ ./web_access.patch ]; + preConfigure = '' + export ZLIB_CFLAGS=" " + export ZLIB_LIBS="-lz" + export UUID_CFLAGS=" " + export UUID_LIBS="-luuid" + ''; meta = with stdenv.lib; { description = "Real-time performance monitoring tool"; diff --git a/pkgs/tools/system/netdata/web_access.patch b/pkgs/tools/system/netdata/web_access.patch deleted file mode 100644 index 3c0fbf7507d7..000000000000 --- a/pkgs/tools/system/netdata/web_access.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/web_client.c.orig 2016-04-17 11:34:20.044455323 +0200 -+++ b/src/web_client.c 2016-04-17 11:34:47.432897957 +0200 -@@ -291,14 +291,14 @@ - buffer_sprintf(w->response.data, "File '%s' does not exist, or is not accessible.", filename); - return 404; - } -- -+#if 0 - // check if the file is owned by us - if(stat.st_uid != web_files_uid()) { - error("%llu: File '%s' is owned by user %d (I run as user %d). Access Denied.", w->id, webfilename, stat.st_uid, getuid()); - buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", filename); - return 403; - } -- -+#endif - if((stat.st_mode & S_IFMT) == S_IFDIR) { - snprintf(webfilename, FILENAME_MAX+1, "%s/index.html", filename); - return mysendfile(w, webfilename);