git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #84260 from bbigras/zenith

zenith: 0.8.0 -> 0.8.1

commitb5a382e6800e77437ec8fd5a43ac21fe9aa7a5f5 authorMario Rodas <marsam@users.noreply.github.com> dateSat 4 Apr 2020, 19:24 (7 years ago) parentb4956df48ec5da
3 files changed+24−5
pkgs/tools/system/zenith/cargo-lock.patch+13 pkgs/tools/system/zenith/default.nix+8−4 pkgs/top-level/all-packages.nix+3−1
pkgs/tools/system/zenith/cargo-lock.patchnew file+13
@@ -0,0 +1,13 @@
1+diff --git a/Cargo.lock b/Cargo.lock
2+index 3f4eec6..2f565c6 100644
3+--- a/Cargo.lock
4++++ b/Cargo.lock
5+@@ -1297,7 +1297,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
6+
7+ [[package]]
8+ name = "zenith"
9+-version = "0.8.0"
10++version = "0.8.1"
11+ dependencies = [
12+ "battery",
13+ "bincode",
pkgs/tools/system/zenith/default.nix+8−4
@@ -1,23 +1,27 @@
1−{ stdenv, rustPlatform, fetchFromGitHub }:
1+{ stdenv, rustPlatform, fetchFromGitHub, IOKit }:
22
33rustPlatform.buildRustPackage rec {
44 pname = "zenith";
5− version = "0.8.0";
5+ version = "0.8.1";
66
77 src = fetchFromGitHub {
88 owner = "bvaisvil";
99 repo = pname;
1010 rev = version;
11− sha256 = "1m709mnhhjs30s91542rhri3xbzsb3kw8zablvn11rwp2iq1lxxx";
11+ sha256 = "12wbx4zhf1rf13g3mw8vcn8aqk9vcza61vi42y6c1pb2km73qw1h";
1212 };
1313
14− cargoSha256 = "1j6pww4mpssnr9zsbfy74llv7336kjrif1qiph998b82qj63vdlg";
14+ cargoPatches = [ ./cargo-lock.patch ];
15+ cargoSha256 = "1nyci2vjwsyfscsd520d1r5vyazb33hv4mrsysy6amss4jdf2dlq";
16+
17+ buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ];
1518
1619 meta = with stdenv.lib; {
1720 description = "Sort of like top or htop but with zoom-able charts, network, and disk usage";
1821 homepage = "https://github.com/bvaisvil/zenith";
1922 license = licenses.mit;
2023 maintainers = with maintainers; [ bbigras ];
24+ # doesn't build on aarch64 https://github.com/bvaisvil/zenith/issues/19
2125 platforms = platforms.x86;
2226 };
2327}
pkgs/top-level/all-packages.nix+3−1
@@ -7720,7 +7720,9 @@ in
77207720
77217721 zdelta = callPackage ../tools/compression/zdelta { };
77227722
7723− zenith = callPackage ../tools/system/zenith {};
7723+ zenith = callPackage ../tools/system/zenith {
7724+ inherit (darwin.apple_sdk.frameworks) IOKit;
7725+ };
77247726
77257727 zerotierone = callPackage ../tools/networking/zerotierone { };
77267728