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.

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

dotnet: use dwarfdump from cctools-llvm #326703

Merged
merged 1 commit into from
Jul 13, 2024

Conversation

corngood
Copy link
Contributor

@corngood corngood commented Jul 13, 2024

At some point cctools changed from cctools-llvm to cctools-port, and this broke dotnet.

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.

At some point cctools changed from cctools-llvm to cctools-port, and
this broke dotnet.
@github-actions github-actions bot added the 6.topic: dotnet Language: .NET label Jul 13, 2024
@corngood corngood self-assigned this Jul 13, 2024
@paparodeo
Copy link
Contributor

cc @reckenrode

@reckenrode
Copy link
Contributor

reckenrode commented Jul 13, 2024

Sorry about that. cctools was reverted back to cctools-port as part of #322388, darwin.binutils(.bintools) being the effective replacement for cctools-llvm in most cases.

When #307880 is merged, dwarfdump will be found in ld64 since it comes from that upstream. cctools-apple and cctools-llvm will be added to darwin-aliases.nix, preventing their use in nixpkgs. There will be a follow-up treewide PR adding an alias for cctools-port.

Update: This was a good PR because it found a mistake in my ld64 derivation. dwarfdump comes from LLVM. I don’t know why I thought it was an alias for unwinddump. I’ll also fix #307880.

The change LGTM for master. I’m going to go ahead and merge it, so I can pull it into my ld64 PR with the change to use the ld64 package from cctools-llvm.

Copy link
Contributor

@reckenrode reckenrode left a comment

Choose a reason for hiding this comment

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

lgtm

@reckenrode reckenrode merged commit 85de798 into NixOS:master Jul 13, 2024
8 of 9 checks passed
@corngood corngood deleted the dotnet-darwin-fix branch July 13, 2024 11:36
@corngood
Copy link
Contributor Author

Result of nixpkgs-review pr 326703 run on aarch64-darwin 1

12 packages built:
  • dotnetCorePackages.dotnet_8.aspnetcore
  • dotnetCorePackages.dotnet_8.runtime
  • dotnetCorePackages.dotnet_8.sdk
  • dotnetCorePackages.dotnet_8.sdk.artifacts
  • dotnetCorePackages.dotnet_8.sdk.packages
  • dotnetCorePackages.dotnet_8.vmr
  • dotnetCorePackages.dotnet_9.aspnetcore
  • dotnetCorePackages.dotnet_9.runtime
  • dotnetCorePackages.dotnet_9.sdk
  • dotnetCorePackages.dotnet_9.sdk.artifacts
  • dotnetCorePackages.dotnet_9.sdk.packages
  • dotnetCorePackages.dotnet_9.vmr

@reckenrode reckenrode mentioned this pull request Jul 13, 2024
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: dotnet Language: .NET
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants