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

zenmonitor: init at 1.3 #73815

Merged
merged 1 commit into from Jan 29, 2020
Merged

zenmonitor: init at 1.3 #73815

merged 1 commit into from Jan 29, 2020

Conversation

@alexbakker
Copy link
Member

alexbakker commented Nov 20, 2019

Motivation for this change

Monitoring software for AMD Zen-based CPUs. See also: #73814.

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 nix-review --run "nix-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.
@alexbakker alexbakker force-pushed the alexbakker:zenmonitor branch from d74e19f to 76e4b66 Dec 7, 2019
@alexbakker

This comment has been minimized.

Copy link
Member Author

alexbakker commented Dec 7, 2019

@erikarvstedt Thanks. Fixed.

@alexbakker alexbakker force-pushed the alexbakker:zenmonitor branch from 76e4b66 to 900e94f Dec 7, 2019
@alexbakker

This comment has been minimized.

Copy link
Member Author

alexbakker commented Dec 7, 2019

Copy link
Member

erikarvstedt left a comment

ACK 900e94f

@alexbakker alexbakker force-pushed the alexbakker:zenmonitor branch from 900e94f to 5722cfc Jan 2, 2020
@alexbakker

This comment has been minimized.

Copy link
Member Author

alexbakker commented Jan 2, 2020

What's the status here? Can this be merged?

@alexbakker alexbakker force-pushed the alexbakker:zenmonitor branch from 5722cfc to b69e7b1 Jan 3, 2020
@alexbakker

This comment has been minimized.

Copy link
Member Author

alexbakker commented Jan 3, 2020

@jtojnar Sure. Done.

@filalex77

This comment has been minimized.

Copy link
Contributor

filalex77 commented Jan 16, 2020

I think the kernel doesn't provide cpuid.h for aarch64. Maybe adding llvmPackages.libclang to nativeBuildInputs can resolve this?

Or we can just mark aarch64 as broken.

@alexbakker alexbakker force-pushed the alexbakker:zenmonitor branch from b69e7b1 to 2b50d3f Jan 19, 2020
@alexbakker

This comment has been minimized.

Copy link
Member Author

alexbakker commented Jan 19, 2020

@filalex77 I've restricted the list of platforms to i686-linux and x86_64-linux.

@alexbakker alexbakker force-pushed the alexbakker:zenmonitor branch from 2b50d3f to c4cc9f7 Jan 19, 2020
@alexbakker

This comment has been minimized.

Copy link
Member Author

alexbakker commented Jan 27, 2020

@marsam This PR appears to be stuck.

Copy link
Contributor

marsam left a comment

Thanks for the heads up, I left a few comments; besides that, LGTM

pkgs/os-specific/linux/zenmonitor/default.nix Outdated Show resolved Hide resolved
pkgs/os-specific/linux/zenmonitor/default.nix Outdated Show resolved Hide resolved
@alexbakker alexbakker force-pushed the alexbakker:zenmonitor branch 2 times, most recently from f1b286c to 3513858 Jan 29, 2020
@alexbakker alexbakker changed the title zenmonitor: init at 1.2 zenmonitor: init at 1.3 Jan 29, 2020
@alexbakker

This comment has been minimized.

Copy link
Member Author

alexbakker commented Jan 29, 2020

@marsam Bumped to 1.3 and addressed your comments.

@alexbakker alexbakker force-pushed the alexbakker:zenmonitor branch from 3513858 to fb775ae Jan 29, 2020
@alexbakker

This comment has been minimized.

Copy link
Member Author

alexbakker commented Jan 29, 2020

@marsam Done.

@marsam marsam merged commit 90d969e into NixOS:master Jan 29, 2020
15 checks passed
15 checks passed
zenmonitor on aarch64-linux No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
zenmonitor on x86_64-linux Success
Details
@marsam

This comment has been minimized.

Copy link
Contributor

marsam commented Jan 29, 2020

@alexbakker thank you for your contribution

@alexbakker

This comment has been minimized.

Copy link
Member Author

alexbakker commented Jan 29, 2020

@marsam Thanks for your help!

dkudriavtsev added a commit to dkudriavtsev/nixpkgs that referenced this pull request Feb 2, 2020
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

5 participants
You can’t perform that action at this time.