From 2ec6f070aa07a4c280d7b8ad3c87815078126240 Mon Sep 17 00:00:00 2001 From: Raghav Sood Date: Thu, 16 Jul 2020 14:39:08 +0000 Subject: [PATCH] netdata: 1.23.0 -> 1.23.2 --- pkgs/tools/system/netdata/default.nix | 10 ++++++++-- pkgs/tools/system/netdata/go.d.plugin.nix | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 722df46c05f5..e5316e028dbe 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -14,14 +14,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.23.0"; + version = "1.23.2"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "04x53hr2d086y4q990h7lazaykaizb5g45nmfvahqzxj72b0hvdf"; + sha256 = "1vv92plk9dxk6fl76ik1zralpzc35ymrfyrf1cr6pv8q3agyy5k4"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -36,6 +36,12 @@ in stdenv.mkDerivation rec { patches = [ ./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"; diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 3e38b7bfdf9a..211192c1e736 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "netdata-go.d.plugin"; - version = "0.19.2"; + version = "0.20.0"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - sha256 = "03a67kvhickzg96jvzxhg1jih48m96rl4mkg0wgmbi7a676dl7lq"; + sha256 = "0wd1wg56q955jm5ksq2zqzlms1nlxx7n7vv43l096k1578fv93jv"; }; - vendorSha256 = "0mmnkkzpv8lmxn11idikddmjinxv1y823ny0wxp271agiinyfpn8"; + vendorSha256 = "1k84l97fw4s9jdwbka4p168m7l7wil0c4cpijis8ypj3g1xfrw90"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ];