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

wipe: fix cross-compilation #373438

Merged
merged 4 commits into from
Jan 16, 2025
Merged

wipe: fix cross-compilation #373438

merged 4 commits into from
Jan 16, 2025

Conversation

onny
Copy link
Contributor

@onny onny commented Jan 13, 2025 •
edited
Loading

Fix #371785

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.

@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different platform than they will be used on label Jan 13, 2025
@nix-owners nix-owners bot requested a review from abbradar January 13, 2025 13:09
@onny
Copy link
Contributor Author

onny commented Jan 14, 2025

@FliegendeWurst Thank you, fixed it 👍

@onny onny requested a review from FliegendeWurst January 15, 2025 17:52
@onny onny requested a review from FliegendeWurst January 16, 2025 11:45
@onny
Copy link
Contributor Author

onny commented Jan 16, 2025

Thank you @FliegendeWurst, fixed it :)

@FliegendeWurst FliegendeWurst added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 16, 2025
@FliegendeWurst FliegendeWurst merged commit a0f2036 into NixOS:master Jan 16, 2025
25 of 28 checks passed
@onny
Copy link
Contributor Author

onny commented Jan 16, 2025

Thank you :)

@onny onny added the backport release-24.11 Backport PR automatically label Jan 16, 2025
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 16, 2025

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-373438-to-release-24.11 origin/release-24.11
cd .worktree/backport-373438-to-release-24.11
git switch --create backport-373438-to-release-24.11
git cherry-pick -x 72fe607771901908ffea7f69f1cef2c681f770c9 f292fa21d79a410a8d75808fd8a033edd11d8dd9 b4b3c73a946d7e20d7afcaba8e08cef87c4c1412 16238201caa1cb65e68f3dd7bfb0ec1f7152bf9c

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FliegendeWurst FliegendeWurst FliegendeWurst approved these changes

@abbradar abbradar Awaiting requested review from abbradar

Assignees
No one assigned
Labels
6.topic: cross-compilation Building packages on a different platform than they will be used on 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person backport release-24.11 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Build failure: pkgsCross.riscv64.wipe
2 participants
@onny @FliegendeWurst