diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-20 22:11:42 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-20 22:11:42 -0700 |
| commit | 6b15fdce86eddd5d23ff448f6a7b50b319c5e686 (patch) | |
| tree | 22d541647a440d8fbaabc0ec869a551ce02ff671 /pkgs/tools/system | |
| parent | 34a05e29f119bf06fe218b761b3999e4c7a87e65 (diff) | |
| parent | 788deaad9dbc27b94c0d930b617f659e71ea7987 (diff) | |
| download | nixlib-6b15fdce86eddd5d23ff448f6a7b50b319c5e686.tar nixlib-6b15fdce86eddd5d23ff448f6a7b50b319c5e686.tar.gz nixlib-6b15fdce86eddd5d23ff448f6a7b50b319c5e686.tar.bz2 nixlib-6b15fdce86eddd5d23ff448f6a7b50b319c5e686.tar.lz nixlib-6b15fdce86eddd5d23ff448f6a7b50b319c5e686.tar.xz nixlib-6b15fdce86eddd5d23ff448f6a7b50b319c5e686.tar.zst nixlib-6b15fdce86eddd5d23ff448f6a7b50b319c5e686.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/shells/ion/default.nix pkgs/tools/misc/cicero-tui/default.nix
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/freeipmi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/netdata/default.nix | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index f7e041a849d4..8dbe4b5e0033 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, lib, stdenv, libgcrypt, readline, libgpgerror }: stdenv.mkDerivation rec { - version = "1.6.7"; + version = "1.6.8"; pname = "freeipmi"; src = fetchurl { url = "mirror://gnu/freeipmi/${pname}-${version}.tar.gz"; - sha256 = "1gyyx99q02p3v2nqm3h53mkjd33l0hrapwg4alg6qr9k74qik1dv"; + sha256 = "0w8af1i57szmxl9vfifwwyal7xh8aixz2l9487wvy6yckqk6m92a"; }; buildInputs = [ libgcrypt readline libgpgerror ]; 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"; |