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: add gpu recognition, new apple sdk, refactor #360568

Merged
merged 9 commits into from
Dec 12, 2024

Conversation

gepbird
Copy link
Contributor

@gepbird gepbird commented Nov 30, 2024

Closes ClementTsang/bottom#1629

Tracking: #354146, can't test it as I don't have a darwin machine, but in another commit (9a78e67) I saw this exact change so most likely it works.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@gepbird
Copy link
Contributor Author

gepbird commented Nov 30, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 360568


x86_64-linux

✅ 1 package built:
  • bottom

@ofborg ofborg bot requested review from figsoda and berbiche December 1, 2024 13:25
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 1 10.rebuild-linux: 1 labels Dec 1, 2024
@uncenter
Copy link
Member

uncenter commented Dec 2, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 360568


aarch64-darwin

✅ 1 package built:
  • bottom

@uncenter uncenter added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 2, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 10, 2024
@gepbird
Copy link
Contributor Author

gepbird commented Dec 11, 2024

Fixed "merge conflict" by #322537

Since I had a nixfmt commit, I didn't need to resolve a usual merge conflict, when rebasing git automatically dropped my now empty nixfmt commit.

@gepbird gepbird removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 11, 2024
@gepbird gepbird marked this pull request as draft December 11, 2024 08:49
@gepbird
Copy link
Contributor Author

gepbird commented Dec 11, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 360568


x86_64-linux

✅ 1 package built:
  • bottom

@gepbird gepbird marked this pull request as ready for review December 11, 2024 09:24
@gepbird gepbird requested a review from uncenter December 11, 2024 09:24
@uncenter
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 360568


aarch64-darwin

✅ 1 package built:
  • bottom

@Aleksanaa Aleksanaa merged commit a188d1e into NixOS:master Dec 12, 2024
40 of 41 checks passed
@gepbird gepbird deleted the bottom-gpu-fix branch December 12, 2024 14:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GPU% in processes always shows 0% on NixOS
4 participants