Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bottom: init at 0.4.7 #99126

Merged
merged 2 commits into from Oct 1, 2020
Merged

bottom: init at 0.4.7 #99126

merged 2 commits into from Oct 1, 2020

Conversation

@berbiche
Copy link
Member

@berbiche berbiche commented Sep 29, 2020

Motivation for this change

bottom is "a cross-platform graphical process/system monitor with a customizable interface and a multitude of features".
ytop has been archived by its owner.
bottom has been recommended by ytop's creator.

Some tests are failing because they call the binary and it tries to create its default file in $XDG_CONFIG_HOME/bottom/bottom.toml.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
@berbiche berbiche changed the title Bottom bottom: init at 0.4.7 Sep 29, 2020
@berbiche
Copy link
Member Author

@berbiche berbiche commented Sep 29, 2020

ccing ytop's maintainer: @sikmir

Copy link
Contributor

@r-burns r-burns left a comment

Works great for me on non-NixOS linux.

Needs IOKit to compile on macOS, and the resulting executable just shows empty graphs. Is that a bug, or is this linux-only?

@@ -0,0 +1,26 @@
{ stdenv, fetchFromGitHub, rustPlatform }:
Copy link
Contributor

@r-burns r-burns Sep 30, 2020

Suggested change
{ stdenv, fetchFromGitHub, rustPlatform }:
{ stdenv, fetchFromGitHub, rustPlatform, darwin }:

Copy link
Member Author

@berbiche berbiche Sep 30, 2020

Thanks, fixed!

};

cargoSha256 = "XeX6QM0a628mcaptNZkKAvDnGfW5tx+aWNBpMyjz44M=";

Copy link
Contributor

@r-burns r-burns Sep 30, 2020

Suggested change
buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.IOKit;

Copy link
Member Author

@berbiche berbiche Sep 30, 2020

Thanks, fixed!

Co-authored-by: r-burns <52847440+r-burns@users.noreply.github.com>
@berbiche
Copy link
Member Author

@berbiche berbiche commented Sep 30, 2020

I tried building this on a Darwin machine but I had SSL certificate errors when fetching dependencies with Cargo so I'll leave the testing to @r-burns

Copy link
Contributor

@r-burns r-burns left a comment

Awesome, thanks for taking care of that, compiles + runs for me now. I see that bottom claims to support macOS so I've filed an issue upstream. As for this PR, LGTM 🎉

stigtsp
stigtsp approved these changes Oct 1, 2020
Copy link
Member

@stigtsp stigtsp left a comment

LGTM

Built and tested OK on linux x64

Result of nixpkgs-review pr 99126 1

1 package built:
  • bottom

@stigtsp stigtsp merged commit 302ef60 into NixOS:master Oct 1, 2020
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants