rustc: Correct enable-profiler linux check#343059
Merged
philiptaron merged 1 commit intoNixOS:masterfrom Sep 19, 2024
Merged
Conversation
remove the `isRedox` condition which was added because `stdenv.isLinux` uses `hostPlatform`, after specifying `targetPlatform` it's no longer necessary.
13 tasks
Member
Author
|
Will cause cross rebuilds so targetting staging |
This was referenced Sep 19, 2024
philiptaron
approved these changes
Sep 19, 2024
Member
|
Yeah, we merge non-Hydra-relevant cross rebuilds into master all the time. |
Member
Author
|
|
Member
Author
|
Double checked and there's no profiler on redox. 2 approvals, merging. EDIT @philiptaron you merged while I was writing this 😄 |
Contributor
|
Same logic as you my friend. 👍🏻 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
remove the
isRedoxcondition which was added becausestdenv.isLinuxuseshostPlatform, after specifyingtargetPlatformit's no longer necessary.Split from #314832
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.