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

rocprofiler: init at 5.3.3 #203226

Closed
wants to merge 3 commits into from
Closed

Conversation

Madouura
Copy link
Contributor

@Madouura Madouura commented Nov 27, 2022

Description of changes

Tracking: #197885

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

version = finalAttrs.rocmVersion;

src = fetchurl {
url = "https://repo.radeon.com/rocm/apt/${finalAttrs.rocmVersion}/pool/main/h/${finalAttrs.pname}/${finalAttrs.pname}_1.0.0.${finalAttrs.modVersion}-${finalAttrs.magicVersion}~${finalAttrs.ubuntuVersion}_amd64.deb";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would recommend to use a with finalAttrs for this one line to reduce code duplication

stdenv.mkDerivation (finalAttrs: {
pname = "hsa-amd-aqlprofile";
rocmVersion = "5.3.3";
modVersion = with lib.strings; concatStrings (intersperse "0" (splitString "." finalAttrs.rocmVersion));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
modVersion = with lib.strings; concatStrings (intersperse "0" (splitString "." finalAttrs.rocmVersion));
modVersion = with lib; concatStrings (intersperse "0" (splitString "." finalAttrs.rocmVersion));

Comment on lines +41 to +42
patchShebangs test/run.sh
patchShebangs bin/*.sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
patchShebangs test/run.sh
patchShebangs bin/*.sh
patchShebangs test/run.sh bin/*.sh

'';

postInstall = ''
patchelf --set-rpath ${lib.makeLibraryPath (finalAttrs.nativeBuildInputs ++ finalAttrs.buildInputs)}:$out/lib $out/lib/rocprofiler/librocprof-tool.so*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We cannot combine nativeBuildInputs with buildInputs because they have different arches when cross compiling.

@Madouura
Copy link
Contributor Author

Rolled into #206421

@Madouura Madouura closed this Dec 16, 2022
@Madouura Madouura deleted the pr/rocprofiler branch December 16, 2022 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants