mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 05:37:27 +03:00
Merge pull request #123707 from leotaku/update-netdata
netdata: 1.30.1 -> 1.31.0
This commit is contained in:
commit
6bad8a5633
@ -8,7 +8,6 @@
|
|||||||
, withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct
|
, withNetfilter ? (!stdenv.isDarwin), libmnl, libnetfilter_acct
|
||||||
, withSsl ? true, openssl
|
, withSsl ? true, openssl
|
||||||
, withDebug ? false
|
, withDebug ? false
|
||||||
, fetchpatch
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
@ -16,14 +15,14 @@ with 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.30.1";
|
version = "1.31.0";
|
||||||
pname = "netdata";
|
pname = "netdata";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "netdata";
|
owner = "netdata";
|
||||||
repo = "netdata";
|
repo = "netdata";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "0cp6gbn38f1cr0jkr64vvwz005cvnwj3hgfxs147wap9w228k46r";
|
sha256 = "0x6vg2z7x83b127flbfqkgpakd5md7n2w39dvs8s16facdy2lvry";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||||
@ -40,11 +39,6 @@ in stdenv.mkDerivation rec {
|
|||||||
# required to prevent plugins from relying on /etc
|
# required to prevent plugins from relying on /etc
|
||||||
# and /var
|
# and /var
|
||||||
./no-files-in-etc-and-var.patch
|
./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";
|
NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1";
|
||||||
|
Loading…
Reference in New Issue
Block a user