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

difftastic: fix build with clang 12+ #268190

Merged
merged 1 commit into from
Nov 18, 2023

Conversation

reckenrode
Copy link
Contributor

Description of changes

Work around #166205.

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/)
  • 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.

@ofborg ofborg bot requested review from figsoda and ethancedwards8 November 18, 2023 00:44
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 18, 2023
Copy link
Contributor

@adamcstephens adamcstephens left a comment

Choose a reason for hiding this comment

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

linux builds are cached and this fixes darwin.


Result of nixpkgs-review pr 268190 run on x86_64-darwin 1

1 package built:
  • difftastic

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

1 package built:
  • difftastic

@delroth delroth added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 18, 2023
@delroth delroth added 12.approvals: 2 This PR was reviewed and approved by two reputable people and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Nov 18, 2023
@adamcstephens adamcstephens merged commit 0056175 into NixOS:master Nov 18, 2023
27 checks passed
@figsoda
Copy link
Member

figsoda commented Nov 18, 2023

Thanks!

@reckenrode
Copy link
Contributor Author

reckenrode commented Jan 20, 2024

I got a notification complaining that this code has been copied and pasted to different derivations. The comment appears to have been deleted, but I wanted to respond and explain.

This change is a workaround that was expected to be needed only short term. The proper fix belongs in either cc-wrapper or ld-wrapper. I did not implement that fix because @toonn is already working on it, and I did not want to step on that work, but these issues needed to be addressed to get the LLVM update through the staging-next cycle.

@reckenrode reckenrode deleted the difftastic-clang16 branch January 20, 2024 15:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12.approvals: 2 This PR was reviewed and approved by two reputable people
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants