Commit Graph

299 Commits

Author SHA1 Message Date
Adam Joseph
c407873d50 qemu: allow to disable generation of documentation
I've been having trouble with some qemu builds since the v8.0.0 bump
failing with:

```
kernel-doc 'perl /build/qemu/docs/../scripts/kernel-doc -rst -enable-lineno -sphinx-version 5.3.0 -Werror /build/qemu/docs/../include/qemu/bitops.h' processing failed with: [Errno 2] No such file or directory: 'perl'
```

... this happens despite `perl` being part of `stdenv`.  Adding
`perl` to `nativeBuildInputs` doesn't seem to fix it.  It is handy
to be able to simply skip the docs in situations like this in order
to maintain forward progress, so this commit adds `enableDocs?true`
to allow that.
2023-04-22 00:24:23 +03:00
Alyssa Ross
10a0be03de qemu: 7.2.1 -> 8.0.0
Now that shaderinclude is Python, I don't think we need Perl any more.

virtiofsd has been removed in favor of the standalone virtiofsd package.

Co-authored-by: Will Cohen <willcohen@users.noreply.github.com>
2023-04-20 13:22:20 +00:00
github-actions[bot]
e88cc8f10e
Merge master into staging-next 2023-04-09 18:01:15 +00:00
Alyssa Ross
3c384353a6 qemu: 7.2.0 -> 7.2.1 2023-04-09 14:36:34 +00:00
Vladimír Čunát
4eaca2b138
Merge #188492: glibc: 2.35-224 -> 2.37-8
...into staging
2023-04-03 20:29:07 +02:00
Ivan Babrou
fd56470768 qemu: fix dangling virtiofsd symlink warning
This issue goes away with the change:

```
warning: creating dangling symlink `/nix/store/...//bin/virtiofsd' -> `/nix/store/...-qemu-host-cpu-only-7.1.0/bin/virtiofsd' -> `../libexec/virtiofsd'
```
2023-04-02 09:04:03 +10:00
Maximilian Bosch
26495c833f
qemu: fix build w/ glibc-2.37
Failing Hydra build: https://hydra.nixos.org/build/214419156
Relevant upstream thread: https://lore.kernel.org/qemu-devel/20230110174901.2580297-1-berrange@redhat.com/
2023-04-01 10:35:48 +02:00
dramforever
08e6d08ace qemu: Remove --cpu= flag
'./configure --cpu=$(uname -m)' (essentially) breaks the case of riscv,
where the configure script expects '--cpu=riscv', but 'uname -m' gives
'riscv{32,64}'. This eventually leads to user-mode emulation being
disabled.

Since the configure script can auto-detect the parameter based on
compilers, remove this flag.

Originally added in #147692, but apparently it's not needed and @NickCao
couldn't remember why it was added. See also mailing list discussion at
https://lore.kernel.org/qemu-devel/20230204112502.2558739-1-mjt@msgid.tls.msk.ru/T/
2023-02-10 00:02:36 +08:00
dramforever
f70071e41d qemu: fix cross compilation, again
The python dependencies were fixed for cross in #147692, but the changes
are reversed #190560 due to concerns of accidentally mixing python
versions. Compromise by using python3Packages.python.
2023-02-09 21:55:51 +08:00
Guillaume Girol
33afbf39f6 treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
2023-01-21 12:00:00 +00:00
Robert Scott
0c924ec948 qemu: 7.1.0 -> 7.2.0 2022-12-17 01:47:29 +00:00
Atemu
0524da67eb qemu: enable spiceSupport on Darwin
spice works on Darwin now
2022-10-28 13:10:13 +02:00
Robert Scott
ceee8090d1 qemu: add patch for CVE-2022-3165 2022-10-17 20:25:21 +01:00
Sandro Jäckel
2861239144 qemu: cleanup 2022-10-17 01:29:54 +02:00
Weijia Wang
5353c75388 qemu: add vmnet support 2022-10-13 18:56:19 +00:00
Linus Heckemann
7b30788245 qemu: add patch improving 9p performance
This patch has been accepted by the upstream 9p subsystem maintainer
and should improve the performance of NixOS tests massively.
2022-10-13 18:15:01 +02:00
oxalica
4f74ae0d99 qemu: add canokeySupport 2022-10-04 00:59:26 +08:00
oxalica
b3ca7c9f7b canokey-qemu: init at unstable-2022-06-23 2022-10-04 00:59:26 +08:00
Sandro Jäckel
a87d3f897b
qemu: make sure to not mix python versions 2022-09-09 22:39:25 +02:00
Alyssa Ross
39958a329f qemu: 7.0.0 -> 7.1.0 2022-09-02 07:15:59 +00:00
Robert Scott
444208798a qemu: add patch for CVE-2020-14394 2022-08-28 19:20:43 +00:00
Robert Scott
02ca06405e qemu: add patches for CVE-2022-0216 2022-08-28 19:20:43 +00:00
Alyssa Ross
ab0af3267f
Revert "qemu: fix build w/glibc-2.33"
This reverts commit 04be5ced7e.

Builds fine without the change now, so presumably either Glibc, QEMU,
or both, fixed this in the meantime.
2022-08-05 15:56:36 +00:00
Martin Weinelt
4af35d92a0
python3Packages.sphinx-rtd-theme: rename from sphinx_rtd_theme 2022-08-03 18:39:37 +02:00
Robin Gloster
b2d221795b
qemu: fix CVE-2022-35414 2022-07-25 17:14:57 +02:00
Yuriy Taraday
b0bffdd36f qemu: Add patch to fix 9p support on Darwin
This patch fixes issues with error codes on Darwin host and Linux guest.
It has landed in QEMU master, so should be included in the next release.

Related to #108984.
2022-07-17 10:28:58 +04:00
Arthur Gautier
934a622f7e qemu-utils: ensure we cut off qemu dependency 2022-07-06 07:13:29 +00:00
Arthur Gautier
fef6723f9b qemu-utils: remove qemu dependency
qemu-utils was pulling qemu which is a 900MB dependency. By removing
reference to it (unneeded), we're saving space on our deployments.
qemu-utils is a dependency of cloud-utils
2022-07-06 07:13:29 +00:00
Yuka
ab72035bb7
qemu: add workaround for nested virtualisation (#171789) 2022-05-21 11:24:16 +02:00
Arnout Engelen
218a48c849
qemu: stabilize USB EHCI
This patch fixes a problem that caused the NixOS tests that tested booting
from USB to fail periodically.

Fixes #15690, fixes #104642, fixes #170803

Also submitted upstream at https://lists.nongnu.org/archive/html/qemu-devel/2022-05/msg01484.html
2022-05-08 17:46:54 +02:00
Alyssa Ross
9d733f3d49 qemu: 6.2.0 -> 7.0.0
The guest agent now refuses to build unless being built for one of a
list of specific supported operating systems.

Co-authored-by: Will Cohen <willcohen@users.noreply.github.com>
2022-04-20 15:27:34 +00:00
Alyssa Ross
665bb90fc3 qemu: remove redundant copy of qemu-ga
There's no reason to have one copy of qemu-ga in $out and another in
$ga, and because we only applied remove-references-to to one of the
copies, it caused a collision when QEMU was used in a buildEnv.
2022-04-10 08:11:46 +08:00
matthewcroughan
96674e9c3b qemu: add patch to fix MTP devices
Co-authored-by: Alyssa Ross <hi@alyssa.is>
2022-04-02 16:26:00 +00:00
davidak
6ea8d5ee71
Merge pull request #165297 from Stunkymonkey/treewide-pname-version-17
treewide: rename name to pname&version
2022-03-24 16:38:33 +01:00
Felix Buehler
3bc5196252 treewide: rename name to pname&version 2022-03-23 22:55:50 +01:00
Ivan Babrou
c573e3eaa8 qemu: support running Linux 5.17 on aarch64-darwin 2022-03-22 19:30:15 +00:00
Alyssa Ross
2b2ac31248 qemu: remove 9p O_NOATIME patch
This is redundant with QEMU commit a5804fcf7b ("9pfs: local: ignore
O_NOATIME if we don't have permissions"), included in QEMU since
5.1.0, which will retry opens without O_NOATIME if they fail with it.
2022-03-14 12:15:57 +00:00
Will Cohen
b20f90e940 qemu: backport 9p-darwin to v6.2.0 2022-03-10 00:03:14 +00:00
Alyssa Ross
c738e61a94 qemu: put virtiofsd in bin/
According to the QEMU documentation, virtiofsd is supposed to be run
directly by users.  It therefore makes sense to have it in bin/, so it
will be in PATH.  Such a change wouldn't make sense upstream, because
it would then conflict with the virtiofsd package, which is generally
preferred if available.  But in Nixpkgs, we don't have to worry about
that and can just make QEMU's virtiofsd a lower priority than the one
from the dedicated package.

[1]: https://qemu.readthedocs.io/en/latest/tools/virtiofsd.html

Fixes: https://github.com/NixOS/nixpkgs/issues/113172 ("QEmu: virtiofsd prone to be garbage collected.")
Fixes: https://github.com/NixOS/nixpkgs/pull/153007 ("nixos/libvirtd: add ${cfg.qemu.package}/libexec to PATH")
2022-03-04 12:42:08 +00:00
Matthias Treydte
38cf6fea69 qemu: fix qemu.ga including qemu in it's closure
The qemu-ga binary is already moved to a separate
output but still depends on qemu, adding about
600MiB to it's closure.

The command "strings qemu-ga" reveals that something
like

/nix/store/bqgpvv5qrpb741swczqk3lrdm5gzaqx2-qemu-host-cpu-only-6.2.0/bin

is contained, causing this false positive. So use
remove-references-to to reduce the closure to about
600KiB.
2022-03-03 21:37:25 +00:00
Robert Scott
b0cb215474
Merge pull request #144946 from risicle/ris-qemu-tests
qemu: enable some basic tests
2022-02-19 15:25:18 +00:00
Robert Scott
5adc3817a0 qemu: fixup basic tests, enable in passthru.tests
these may not be reliable enough to enable by default, but enabling
them as a passthru may allow us to get a feel for which platforms
have trouble with them
2022-02-06 18:31:29 +00:00
Jonathan Ringer
9a16965c75
Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/awesomeversion/default.nix
	pkgs/development/python-modules/md2gemini/default.nix
	pkgs/development/python-modules/mill-local/default.nix
	pkgs/development/python-modules/pyatv/default.nix
	pkgs/development/python-modules/pyezviz/default.nix
	pkgs/development/python-modules/pyinsteon/default.nix
	pkgs/development/python-modules/pylitterbot/default.nix
	pkgs/development/python-modules/pynuki/default.nix
	pkgs/development/python-modules/pypck/default.nix
	pkgs/development/python-modules/types-requests/default.nix
	pkgs/top-level/aliases.nix
2022-02-03 21:29:24 -08:00
Peter Hoeg
c52e85672b qemu: remove broker wrapper script 2022-02-03 11:33:38 +08:00
Alyssa Ross
6c92b6516a qemu: 6.1.0 -> 6.2.0
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.
2022-01-20 15:29:33 +00:00
0x4A6F
29acc14f0d
Merge pull request #143060 from zhaofengli/binfmt-argv0
nixos/binfmt: Add QEMU wrapper to preserve argv[0]
2022-01-06 19:21:47 +01:00
PedroRegisPOAR
80b3160c21 qemu: add meta.mainProgram 2022-01-04 12:31:11 -03:00
Sandro
a25dd4744e
Merge pull request #151233 from Madouura/dev/qemu 2022-01-02 11:27:50 +01:00
Nick Cao
f90a24f944
qemu: fix cross compilation 2021-12-27 18:02:12 +08:00
Vladimír Čunát
c3131d5c32
qemu: disable debug info on aarch64-linux
This is basically a partial revert of a0262a0802.
2021-12-26 12:45:05 +01:00