Skip to content

rustc: Correct enable-profiler linux check#343059

Merged
philiptaron merged 1 commit intoNixOS:masterfrom
Artturin:rustcprofilerconditional
Sep 19, 2024
Merged

rustc: Correct enable-profiler linux check#343059
philiptaron merged 1 commit intoNixOS:masterfrom
Artturin:rustcprofilerconditional

Conversation

@Artturin
Copy link
Member

@Artturin Artturin commented Sep 19, 2024

remove the isRedox condition which was added because stdenv.isLinux uses hostPlatform, after specifying targetPlatform it's no longer necessary.

Split from #314832

Description of changes

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

remove the `isRedox` condition which was added because `stdenv.isLinux` uses `hostPlatform`, after specifying `targetPlatform` it's no longer necessary.
@github-actions github-actions bot added the 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. label Sep 19, 2024
Copy link
Member

@alyssais alyssais left a comment

Choose a reason for hiding this comment

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

Makes sense

@Artturin Artturin changed the base branch from master to staging September 19, 2024 16:22
@Artturin
Copy link
Member Author

Will cause cross rebuilds so targetting staging

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Sep 19, 2024
@Artturin Artturin marked this pull request as ready for review September 19, 2024 17:49
Copy link
Contributor

@philiptaron philiptaron left a comment

Choose a reason for hiding this comment

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

Will cause cross rebuilds so targetting staging

No rebuilds on non-cross, so I do prefer that it targets master.

@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two persons. label Sep 19, 2024
@alyssais
Copy link
Member

Yeah, we merge non-Hydra-relevant cross rebuilds into master all the time.

@Artturin Artturin changed the base branch from staging to master September 19, 2024 21:50
@Artturin
Copy link
Member Author

rustc is in release-cross.nix but it seems it'll only rebuild the bsd's as they're the only non-linux which uses common

@philiptaron philiptaron merged commit f2e4894 into NixOS:master Sep 19, 2024
@Artturin
Copy link
Member Author

Artturin commented Sep 19, 2024

Double checked and there's no profiler on redox.

2 approvals, merging.

EDIT @philiptaron you merged while I was writing this 😄

@philiptaron
Copy link
Contributor

Same logic as you my friend. 👍🏻

@Artturin Artturin deleted the rustcprofilerconditional branch July 23, 2025 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants