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.

Sign up for GitHub

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

Jump to bottom

binutils: restore nm autodetection on darwin #189894

Merged
merged 1 commit into from
Sep 6, 2022
Merged

binutils: restore nm autodetection on darwin #189894

merged 1 commit into from
Sep 6, 2022

Conversation

trofi
Copy link
Contributor

@trofi trofi commented Sep 5, 2022 •
edited
Loading

The change restores the patch nixpkgs kept for binutils-2.38.
On top of that we revert the second binutils-2.39-specific commit
that attempted to fix it.

We can drop both reverts once https://sourceware.org/PR29547 is fixed.

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.

@trofi
binutils: restore nm autodetection on darwin
fef040a 
The change restores the patch `nixpkgs` kept for `binutils-2.38`.
On top of that we revert the second `binutils-2.39`-specific commit
that attempted to fix it.

We can drop both reverts once https://sourceware.org/PR29547 is fixed.
@trofi trofi mentioned this pull request Sep 5, 2022
Merged
13 tasks
@ofborg ofborg bot requested a review from Ericson2314 September 5, 2022 19:49
@risicle
Copy link
Contributor

risicle commented Sep 6, 2022

binutils now builds for me, macos 10.15.

@trofi trofi merged commit f3e09e3 into NixOS:staging Sep 6, 2022
@trofi trofi deleted the binutils-restore-nm-detection branch September 6, 2022 06:18
@toonn toonn mentioned this pull request Sep 12, 2022
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@risicle risicle Awaiting requested review from risicle

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@trofi @risicle