diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-05-11 09:09:10 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-05-11 09:09:10 +0200 |
| commit | 7982550ac43ffb81dcff7a86d10508409a5737b4 (patch) | |
| tree | 155c412c1dbf31e582a9a71e6e972ca579e8464b /pkgs/tools/system | |
| parent | e56889eb497490add5540a1c5018992aead5b14b (diff) | |
| parent | 10e16ec9abc3fce14fb876409e47a4db9940ecd7 (diff) | |
| download | nixlib-7982550ac43ffb81dcff7a86d10508409a5737b4.tar nixlib-7982550ac43ffb81dcff7a86d10508409a5737b4.tar.gz nixlib-7982550ac43ffb81dcff7a86d10508409a5737b4.tar.bz2 nixlib-7982550ac43ffb81dcff7a86d10508409a5737b4.tar.lz nixlib-7982550ac43ffb81dcff7a86d10508409a5737b4.tar.xz nixlib-7982550ac43ffb81dcff7a86d10508409a5737b4.tar.zst nixlib-7982550ac43ffb81dcff7a86d10508409a5737b4.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/bottom/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/system/netdata/default.nix | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/system/bottom/default.nix b/pkgs/tools/system/bottom/default.nix index eafa0edd7264..1c0972970419 100644 --- a/pkgs/tools/system/bottom/default.nix +++ b/pkgs/tools/system/bottom/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "bottom"; - version = "0.5.7"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ClementTsang"; repo = pname; rev = version; - sha256 = "sha256-9L7FtYIaWSOwNQ8zOLvxjt51o8A5MqqfF/iIyJs2TJA="; + sha256 = "sha256-z0WLD6XOlsM5UL9/nUU5Jk1F+UFLm4N42zAlgY3zEbM="; }; prePatch = '' @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit; - cargoSha256 = "sha256-EYgfU7DVqboI3YMqYY5N89Rzltm5CHSZHJP/znGehxw="; + cargoSha256 = "sha256-m2UVpsVTEmf6fgE1CFRE6+3097bKnkrMKtY3fAOjS2E="; doCheck = false; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index 5eb39c7f6d85..4dc0d80b3b58 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -56,6 +56,8 @@ in stdenv.mkDerivation rec { # rename this plugin so netdata will look for setuid wrapper mv $out/libexec/netdata/plugins.d/apps.plugin \ $out/libexec/netdata/plugins.d/apps.plugin.org + mv $out/libexec/netdata/plugins.d/cgroup-network \ + $out/libexec/netdata/plugins.d/cgroup-network.org mv $out/libexec/netdata/plugins.d/perf.plugin \ $out/libexec/netdata/plugins.d/perf.plugin.org mv $out/libexec/netdata/plugins.d/slabinfo.plugin \ |