Skip to content

Comments

qemu: fix darwin build#148251

Merged
Mic92 merged 1 commit intoNixOS:masterfrom
Mic92:qemu
Dec 2, 2021
Merged

qemu: fix darwin build#148251
Mic92 merged 1 commit intoNixOS:masterfrom
Mic92:qemu

Conversation

@Mic92
Copy link
Member

@Mic92 Mic92 commented Dec 2, 2021

Motivation for this change

#125948 (comment)

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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Dec 2, 2021
@Mic92
Copy link
Member Author

Mic92 commented Dec 2, 2021

cannot test darwin just now.
@GrahamcOfBorg build qemu

@Mic92
Copy link
Member Author

Mic92 commented Dec 2, 2021

cc @NixOS/darwin-maintainers

@ofborg ofborg bot requested review from alyssais and edolstra December 2, 2021 09:08
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Dec 2, 2021
@uri-canva
Copy link
Contributor

Tested locally on x86_64-darwin running Monterey, works and fixes the issue.

@Mic92 Mic92 merged commit c8fa6a4 into NixOS:master Dec 2, 2021
@Mic92 Mic92 deleted the qemu branch December 2, 2021 10:21
@github-actions
Copy link
Contributor

github-actions bot commented Dec 2, 2021

Successfully created backport PR #148259 for release-21.05.

@github-actions
Copy link
Contributor

github-actions bot commented Dec 2, 2021

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

Please cherry-pick the changes locally.

git fetch origin release-21.05
git worktree add -d .worktree/backport-148251-to-release-21.05 origin/release-21.05
cd .worktree/backport-148251-to-release-21.05
git checkout -b backport-148251-to-release-21.05
ancref=$(git merge-base 8ad2c0423eb1d35701ed8092f03cdb32e0959795 56ea0c9308e084acdf59b46721619cc847ae8b06)
git cherry-pick -x $ancref..56ea0c9308e084acdf59b46721619cc847ae8b06

@github-actions
Copy link
Contributor

github-actions bot commented Dec 2, 2021

Successfully created backport PR #148286 for release-21.11.

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 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants