Skip to content

rustc: remove Darwin special-casing#242749

Merged
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
reckenrode:rustc-darwin-cleanup
Jul 11, 2023
Merged

rustc: remove Darwin special-casing#242749
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
reckenrode:rustc-darwin-cleanup

Conversation

@reckenrode
Copy link
Copy Markdown
Contributor

Description of changes

An attempt to remove it was made in #106886, but there was a build failure. Since that failure no longer occurs, remove it now.

Based on thefloweringash/nixpkgs@1904236.

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

An attempt to remove it was made in NixOS#106886, but there was a build
failure. Since that failure no longer occurs, remove it now.

Based on thefloweringash/nixpkgs@1904236.
@github-actions github-actions bot added the 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. label Jul 11, 2023
@winterqt
Copy link
Copy Markdown
Member

Just for clarity, what specifically changed that causes the failure not to occur anymore? Or can you not pin it down to the massive amount of work being put into the LLVM bump?

Copy link
Copy Markdown
Contributor

@zowoq zowoq left a comment

Choose a reason for hiding this comment

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

Sorry, I thought I'd removed this over a year ago ...

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Jul 11, 2023
@reckenrode
Copy link
Copy Markdown
Contributor Author

Just for clarity, what specifically changed that causes the failure not to occur anymore? Or can you not pin it down to the massive amount of work being put into the LLVM bump?

I can’t say, unfortunately. I was looking to bump the bootstrap version for the clang 16 bump when I found the old issue and the commit from @thefloweringash’s repo. I applied it to current nixpkgs, and it still works. I assume it’s a combination of improvements in the LLVM environment and Darwin packaging that resolved the missing symbol issue.

@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: 0 This PR does not cause any packages to rebuild on Linux. labels Jul 11, 2023
@SuperSandro2000 SuperSandro2000 merged commit 9a705f9 into NixOS:staging Jul 11, 2023
@reckenrode reckenrode deleted the rustc-darwin-cleanup branch July 11, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: darwin Running or building packages on Darwin 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 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: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants