about summary refs log tree commit diff
path: root/pkgs/tools/system
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2021-05-20 19:45:10 -0500
committerGitHub <noreply@github.com>2021-05-20 19:45:10 -0500
commit6bad8a5633d6c485c37b169905048b6cd365a67b (patch)
tree307c13ae2a2d7aa20dd57d45329f12f558398ecd /pkgs/tools/system
parent4df403634894e20b57d9074b6e480168dfe5715a (diff)
parentd2e042866e9847235313b3a129357dd8fd833493 (diff)
downloadnixlib-6bad8a5633d6c485c37b169905048b6cd365a67b.tar
nixlib-6bad8a5633d6c485c37b169905048b6cd365a67b.tar.gz
nixlib-6bad8a5633d6c485c37b169905048b6cd365a67b.tar.bz2
nixlib-6bad8a5633d6c485c37b169905048b6cd365a67b.tar.lz
nixlib-6bad8a5633d6c485c37b169905048b6cd365a67b.tar.xz
nixlib-6bad8a5633d6c485c37b169905048b6cd365a67b.tar.zst
nixlib-6bad8a5633d6c485c37b169905048b6cd365a67b.zip
Merge pull request #123707 from leotaku/update-netdata
netdata: 1.30.1 -> 1.31.0
Diffstat (limited to 'pkgs/tools/system')
-rw-r--r--pkgs/tools/system/netdata/default.nix10
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix
index 4dc0d80b3b58..d1fa401d4e06 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;
@@ -16,14 +15,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 ];
@@ -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";