Skip to content

bintools-wrapper: symlink unsymlinked binaries from -unwrapped#182385

Merged
Artturin merged 1 commit intoNixOS:stagingfrom
Artturin:bintoolswrapper1
Jul 23, 2022
Merged

bintools-wrapper: symlink unsymlinked binaries from -unwrapped#182385
Artturin merged 1 commit intoNixOS:stagingfrom
Artturin:bintoolswrapper1

Conversation

@Artturin
Copy link
Copy Markdown
Member

@Artturin Artturin commented Jul 21, 2022

Description of changes
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.

@Artturin Artturin requested a review from Ericson2314 as a code owner July 21, 2022 21:50
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. labels Jul 21, 2022
@ofborg ofborg bot requested review from lovesegfault and matthewbauer July 21, 2022 23:33
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 21, 2022
@lovesegfault
Copy link
Copy Markdown
Member

lovesegfault commented Jul 21, 2022

Some rationale would be helpful

@Artturin
bintools-wrapper: symlink unsymlinked binaries from -unwrapped
e682dd8 
this shouldn't change any binary available in the default build environment
because bintools-unwrapped is already in path ( idk where it comes from but i know because objcopy is in path but not in the wrapper )

this just makes all the binaries available under 'bintools' instead of
having to use 'bintools-unwrapped'

reduces confusion because now 'objcopy' and others will be in 'bintools'
@Artturin
Copy link
Copy Markdown
Member Author

Artturin commented Jul 21, 2022 •
edited
Loading

added.

i have been building sway and its almost done

EDIT: sway built

tpwrules
tpwrules approved these changes Jul 22, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@tpwrules tpwrules left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I have needed these binaries before and had to resort to a weird hack to find them. This seems like a good change for discoverability and there are indeed cases where it's necessary. I tested and this does successfully replace my hack.

@bobby285271 bobby285271 added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 23, 2022
@Artturin Artturin merged commit 981d9c0 into NixOS:staging Jul 23, 2022
@Artturin Artturin deleted the bintoolswrapper1 branch July 23, 2022 05:07
@trofi trofi mentioned this pull request Jul 30, 2022
Closed
13 tasks
@mweinelt
Copy link
Copy Markdown
Member

mweinelt commented Aug 10, 2022 •
edited
Loading

Arrived at this change while bisecting a timeout on the prusa-slicer build, where it gets stuck running as at 100%CPU forever.

https://hydra.nixos.org/build/186156640

@Artturin
Copy link
Copy Markdown
Member Author

Artturin commented Aug 10, 2022

Arrived at this change while bisecting a timeout on the prusa-slicer build, where it gets stuck running as at 100%CPU forever.

https://hydra.nixos.org/build/186156640

#185808

@vojta001 vojta001 mentioned this pull request Aug 12, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

1 more reviewer

@tpwrules tpwrules tpwrules approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@Artturin @lovesegfault @mweinelt @tpwrules @bobby285271