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

horizon-eda: fix build #358910

Merged
merged 2 commits into from
Nov 27, 2024
Merged

horizon-eda: fix build #358910

merged 2 commits into from
Nov 27, 2024

Conversation

Bot-wxt1221
Copy link
Member

@Bot-wxt1221 Bot-wxt1221 commented Nov 25, 2024

ZHF: #352882

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Copy link
Contributor

@icewind1991 icewind1991 left a comment

Choose a reason for hiding this comment

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

Builds and runs without issues

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Nov 25, 2024
@Bot-wxt1221 Bot-wxt1221 added the 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign label Nov 25, 2024
@ofborg ofborg bot requested review from jue89 and guserav November 25, 2024 23:32
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Nov 25, 2024
@jue89 jue89 added the backport release-24.11 Backport PR automatically label Nov 26, 2024
@jue89
Copy link
Contributor

jue89 commented Nov 26, 2024

Builds and works on my machine.

@NixOS/nixpkgs-merge-bot merge

@nixpkgs-merge-bot
Copy link
Contributor

@jue89 merge not permitted (#305350):
pr author is not in restricted authors list, in the list are: r-ryantm

@Bot-wxt1221 Bot-wxt1221 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 26, 2024
@jue89
Copy link
Contributor

jue89 commented Nov 26, 2024

After looking into separate commits I noticed 6b889c9 has some changes that are just formatting and not directly related to the build failure fix. I'd suggest to move those changes into the other nixfmt commit.

@Bot-wxt1221 Bot-wxt1221 removed the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Nov 26, 2024
@Bot-wxt1221
Copy link
Member Author

@jue89 Done.

@jue89
Copy link
Contributor

jue89 commented Nov 26, 2024

@Bot-wxt1221 thanks!

Hint for the next time: try not to rebase your PR ... the diff between the old and new head is quite large (but out-of-scope).

I've manually checked that the current head creates the same binary compared to the old head, which is the case.

My ACK still applies.

@wegank wegank added the 12.approvals: 2 This PR was reviewed and approved by two reputable people label Nov 26, 2024
@ofborg ofborg bot requested a review from jue89 November 27, 2024 08:35
@wegank wegank merged commit b020b8e into NixOS:master Nov 27, 2024
34 of 35 checks passed
Copy link
Contributor

Successfully created backport PR for release-24.11:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 2 This PR was reviewed and approved by two reputable people backport release-24.11 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants