From 26e8ab5a7b2ca29af067e1492eb84d877e35e153 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 4 Apr 2020 13:04:53 -0400 Subject: [PATCH 1/2] zenith: 0.8.0 -> 0.8.1 --- pkgs/tools/system/zenith/cargo-lock.patch | 13 +++++++++++++ pkgs/tools/system/zenith/default.nix | 8 +++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/system/zenith/cargo-lock.patch diff --git a/pkgs/tools/system/zenith/cargo-lock.patch b/pkgs/tools/system/zenith/cargo-lock.patch new file mode 100644 index 00000000000..3ab51ad5d4e --- /dev/null +++ b/pkgs/tools/system/zenith/cargo-lock.patch @@ -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", diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 7ca0f380898..80c019995a9 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -2,22 +2,24 @@ 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"; 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; }; } From 48ec5da6acab3bbfd2fc580fb1201d3bd6565d55 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 4 Apr 2020 16:20:00 -0500 Subject: [PATCH 2/2] zenith: enable on darwin --- pkgs/tools/system/zenith/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix index 80c019995a9..f59541c2641 100644 --- a/pkgs/tools/system/zenith/default.nix +++ b/pkgs/tools/system/zenith/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub }: +{ stdenv, rustPlatform, fetchFromGitHub, IOKit }: rustPlatform.buildRustPackage rec { pname = "zenith"; @@ -14,6 +14,8 @@ rustPlatform.buildRustPackage rec { 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f898c91d42b..79fa2cb5028 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };