public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #96523 from Izorkin/netdata

Browse Source
This commit is contained in:
Jörg Thalheim 2020-09-03 20:55:49 +01:00 committed by GitHub
commit 3a6cea9ea6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
{ stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig { stdenv, callPackage, fetchFromGitHub, autoreconfHook, pkgconfig
, CoreFoundation, IOKit, libossp_uuid , CoreFoundation, IOKit, libossp_uuid
, curl, libcap, libuuid, lm_sensors, zlib, fetchpatch , curl, libcap, libuuid, lm_sensors, zlib, fetchpatch
, nixosTests
, withCups ? false, cups , withCups ? false, cups
, withDBengine ? true, libuv, lz4, judy , withDBengine ? true, libuv, lz4, judy
, withIpmi ? (!stdenv.isDarwin), freeipmi , withIpmi ? (!stdenv.isDarwin), freeipmi
@ -14,14 +15,14 @@ with stdenv.lib;
let let
go-d-plugin = callPackage ./go.d.plugin.nix {}; go-d-plugin = callPackage ./go.d.plugin.nix {};
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "1.23.2"; version = "1.24.0";
pname = "netdata"; pname = "netdata";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "netdata"; owner = "netdata";
repo = "netdata"; repo = "netdata";
rev = "v${version}"; rev = "v${version}";
sha256 = "1vv92plk9dxk6fl76ik1zralpzc35ymrfyrf1cr6pv8q3agyy5k4"; sha256 = "19zr2wlsc8rbw6a7vjy4ivgq71l34lh70pcgwa0k5sp1vryj7r3d";
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
@ -36,12 +37,6 @@ in stdenv.mkDerivation rec {
patches = [ patches = [
./no-files-in-etc-and-var.patch ./no-files-in-etc-and-var.patch
] ++ stdenv.lib.optionals (!stdenv.cc.isGNU) [
# fix memcpy typo for non-gnu. Remove with the next release.
(fetchpatch {
url = "https://github.com/netdata/netdata/commit/da7f267196b489e9a75724b68897e8f2e6137d72.patch";
sha256 = "1j2sa06j6v491nw58bjx5nqqyfi1n2n9z3p3jiy4yh74m3asldlv";
})
]; ];
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
@ -77,6 +72,8 @@ in stdenv.mkDerivation rec {
rm -r $out/sbin rm -r $out/sbin
''; '';
passthru.tests.netdata = nixosTests.netdata;
meta = { meta = {
description = "Real-time performance monitoring tool"; description = "Real-time performance monitoring tool";
homepage = "https://my-netdata.io/"; homepage = "https://my-netdata.io/";
@ -84,5 +81,4 @@ in stdenv.mkDerivation rec {
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.lethalman ]; maintainers = [ maintainers.lethalman ];
}; };
} }