From 4035ff22b2f368bac6e493f31560fec5a5ae5acd Mon Sep 17 00:00:00 2001 From: Leo Gaskin Date: Wed, 19 May 2021 19:05:21 +0200 Subject: [PATCH 1/2] netdata: 1.30.1 -> 1.31.0 --- pkgs/tools/system/netdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 4dc0d80b3b5..86caa0b36e2 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -16,14 +16,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.30.1"; + version = "1.31.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "0cp6gbn38f1cr0jkr64vvwz005cvnwj3hgfxs147wap9w228k46r"; + sha256 = "0x6vg2z7x83b127flbfqkgpakd5md7n2w39dvs8s16facdy2lvry"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From d2e042866e9847235313b3a129357dd8fd833493 Mon Sep 17 00:00:00 2001 From: Leo Gaskin Date: Wed, 19 May 2021 19:06:01 +0200 Subject: [PATCH 2/2] netdata: Remove patch which is already present in new release --- pkgs/tools/system/netdata/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 86caa0b36e2..d1fa401d4e0 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -8,7 +8,6 @@ , withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct , withSsl ? true, openssl , withDebug ? false -, fetchpatch }: with lib; @@ -40,11 +39,6 @@ in stdenv.mkDerivation rec { # required to prevent plugins from relying on /etc # and /var ./no-files-in-etc-and-var.patch - # cgroups: fix network interfaces detection when using virsh - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/netdata/netdata/pull/11096.patch"; - sha256 = "0f2rd7kgbwbyq9wyn085d213ifvivnpl3qlx1gjrg42rkbi4n8jj"; - }) ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";