diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-05-06 15:48:25 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-05-06 15:48:25 -0400 |
commit | a3e54cb5823b4f338ce46acccb142bae7de585c2 (patch) | |
tree | 223806f291391df55301db8843a4a9bfe9f68349 /pkgs/tools/system/netdata/default.nix | |
parent | c63e69cd894faada0daaef386fcc6273a957c66e (diff) | |
parent | 5f7ad00ae9e1ee00573798e7f9ddfdd28456b075 (diff) | |
download | nixpkgs-a3e54cb5823b4f338ce46acccb142bae7de585c2.tar nixpkgs-a3e54cb5823b4f338ce46acccb142bae7de585c2.tar.gz nixpkgs-a3e54cb5823b4f338ce46acccb142bae7de585c2.tar.bz2 nixpkgs-a3e54cb5823b4f338ce46acccb142bae7de585c2.tar.lz nixpkgs-a3e54cb5823b4f338ce46acccb142bae7de585c2.tar.xz nixpkgs-a3e54cb5823b4f338ce46acccb142bae7de585c2.tar.zst nixpkgs-a3e54cb5823b4f338ce46acccb142bae7de585c2.zip |
Merge remote-tracking branch 'upstream/staging-next' into staging
Diffstat (limited to 'pkgs/tools/system/netdata/default.nix')
-rw-r--r-- | pkgs/tools/system/netdata/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index bd360a24261..c96f92bedfe 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -8,6 +8,7 @@ , withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct , withSsl ? true, openssl , withDebug ? false +, fetchpatch }: with lib; @@ -15,14 +16,14 @@ with lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.29.3"; + version = "1.30.1"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "sha256-GWIQZEC5agJ+Zw7l58IIAJhXP6dxirCmWVBJulzBO5Q="; + sha256 = "0cp6gbn38f1cr0jkr64vvwz005cvnwj3hgfxs147wap9w228k46r"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -39,6 +40,11 @@ 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"; |