Merge pull request #84260 from bbigras/zenith

zenith: 0.8.0 -> 0.8.1
This commit is contained in:
Mario Rodas 2020-04-04 19:24:51 -05:00 committed by GitHub
commit b5a382e680
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 5 deletions

View File

@ -0,0 +1,13 @@
diff --git a/Cargo.lock b/Cargo.lock
index 3f4eec6..2f565c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1297,7 +1297,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "zenith"
-version = "0.8.0"
+version = "0.8.1"
dependencies = [
"battery",
"bincode",

View File

@ -1,23 +1,27 @@
{ stdenv, rustPlatform, fetchFromGitHub }:
{ stdenv, rustPlatform, fetchFromGitHub, IOKit }:
rustPlatform.buildRustPackage rec {
pname = "zenith";
version = "0.8.0";
version = "0.8.1";
src = fetchFromGitHub {
owner = "bvaisvil";
repo = pname;
rev = version;
sha256 = "1m709mnhhjs30s91542rhri3xbzsb3kw8zablvn11rwp2iq1lxxx";
sha256 = "12wbx4zhf1rf13g3mw8vcn8aqk9vcza61vi42y6c1pb2km73qw1h";
};
cargoSha256 = "1j6pww4mpssnr9zsbfy74llv7336kjrif1qiph998b82qj63vdlg";
cargoPatches = [ ./cargo-lock.patch ];
cargoSha256 = "1nyci2vjwsyfscsd520d1r5vyazb33hv4mrsysy6amss4jdf2dlq";
buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
meta = with stdenv.lib; {
description = "Sort of like top or htop but with zoom-able charts, network, and disk usage";
homepage = "https://github.com/bvaisvil/zenith";
license = licenses.mit;
maintainers = with maintainers; [ bbigras ];
# doesn't build on aarch64 https://github.com/bvaisvil/zenith/issues/19
platforms = platforms.x86;
};
}

View File

@ -7720,7 +7720,9 @@ in
zdelta = callPackage ../tools/compression/zdelta { };
zenith = callPackage ../tools/system/zenith {};
zenith = callPackage ../tools/system/zenith {
inherit (darwin.apple_sdk.frameworks) IOKit;
};
zerotierone = callPackage ../tools/networking/zerotierone { };