Conversation
|
@ofborg test simple cage cagebreak cloud-init os-prober sway virtualbox (Apart from "simple", these are all the tests that use custom QEMU options, so probably give us a good spread of functionality.) |
Good, we've done that for sway the last few releases and it worked really well to work out the kinks. (maybe we should officially encourage this workflow somewhere?) |
|
We should have Meson ≥0.58.2 (with 0.59.2 recommended). Otherwise, QEMU will use its own internal Meson, which doesn't have our patches. |
|
#147210 will make it a build failure to use an incompatible Meson version with QEMU. |
9a18991 to
e570208
Compare
The flag -cpu max leaves QEMU 6.1.0 stuck on some systems, for example when /dev/kvm is not read-writable. This does not happen with -cpu qemu64. Getting stuck like that is a regression in 6.1.0 not yet present in 6.0.0 and should be fixed with 6.2.0 according to early testing with rc1. We should consider reverting this change when we merge QEMU 6.2.0. See NixOS#146526. fixes NixOS#141596
The flag -cpu max leaves QEMU 6.1.0 stuck on some systems, for example when /dev/kvm is not read-writable. This does not happen with -cpu qemu64. Getting stuck like that is a regression in 6.1.0 not yet present in 6.0.0 and should be fixed with 6.2.0 according to early testing with rc1. We should consider reverting this change when we merge QEMU 6.2.0. See #146526. fixes #141596
The flag -cpu max leaves QEMU 6.1.0 stuck on some systems, for example when /dev/kvm is not read-writable. This does not happen with -cpu qemu64. Getting stuck like that is a regression in 6.1.0 not yet present in 6.0.0 and should be fixed with 6.2.0 according to early testing with rc1. We should consider reverting this change when we merge QEMU 6.2.0. See #146526. fixes #141596 (cherry picked from commit abbe8cb)
The flag -cpu max leaves QEMU 6.1.0 stuck on some systems, for example when /dev/kvm is not read-writable. This does not happen with -cpu qemu64. Getting stuck like that is a regression in 6.1.0 not yet present in 6.0.0 and should be fixed with 6.2.0 according to early testing with rc1. We should consider reverting this change when we merge QEMU 6.2.0. See #146526. fixes #141596 (cherry picked from commit abbe8cb)
|
#144779 targets staging while this targets master, shouldn't this also target staging if this is dependent on that? |
|
I think changing the base branch would be premature at this point. It's entirely possible #144779 will already be in staging-next or even master by the time this is ready to merge. |
cfabc46 to
f6e42e8
Compare
|
Can we move forward with this by using |
Resolved the merge conflict, rebased on master, and using |
|
I don't think |
6f357b6 to
4631032
Compare
|
The Meson issues should be resolved now, so once OfBorg is happy I'll undraft. |
QEMU now supports automatically detecting which audio drivers to build, so we don't need to pass --audio-drv-list anymore. pkgsMusl.qemu* doesn't build at the moment because of dependency issues, but with a lot of hacks I was able to do enough of a build to be confident the changes to patches etc. are correct for Musl.
This reverts commit af180d5. The bug we were working around with this change has been fixed in QEMU 6.2.0.
|
Now that (x86_64) Darwin stdenv is unbroken: @NixOS/darwin-maintainers call for Darwin testing, since I know QEMU is an important package, and Darwin caused such a big problem last QEMU upgrade, and OfBorg can't even build staging without timing out. It looks like aarch64-darwin stdenv still doesn't work, but there's nothing I can do about that, and we can't hold upgrades forever because of platforms that are broken further up the dependency tree. If you want to test a platform with broken dependencies, you could try to cherry-pick the upgrade onto master (which I hope is working), but you'd also have to cherry-pick the Meson bump, which might be tricky because it ended up being split over multiple PRs. |
This is a draft because QEMU 6.2.0 isn't out yet — currently this PR is updating to a release candidate. I'm trying it this way because last time the QEMU update was delayed for weeks because of Darwin issues. I'm hoping that by opening the PR early, we can identify issues like that in advance, and then be ready to go when the final release comes out.QEMU 6.2.0 has now been released!QEMU now supports automatically detecting which audio drivers to build, so we don't need to pass --audio-drv-list anymore.
pkgsMusl.qemu* doesn't build at the moment because of dependency issues, but with a lot of hacks I was able to do enough of a build to be confident the changes to patches etc. are correct for Musl.
TODO
Motivation for this change
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)