diff options
| author | Artturi <Artturin@artturin.com> | 2021-11-05 22:50:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-05 22:50:39 +0200 |
| commit | 01995f66a9f71c5ce31aef1d96d5aefc88c5161d (patch) | |
| tree | 52f10105d7a8426496fc424df9370e6e262ec220 /pkgs/applications/virtualization | |
| parent | f62283093730fe2edae2de1888b100bfee6142b2 (diff) | |
| parent | d222938650f24f8f34145b87ed8b61a49f4211df (diff) | |
| download | nixpkgs-01995f66a9f71c5ce31aef1d96d5aefc88c5161d.tar nixpkgs-01995f66a9f71c5ce31aef1d96d5aefc88c5161d.tar.gz nixpkgs-01995f66a9f71c5ce31aef1d96d5aefc88c5161d.tar.bz2 nixpkgs-01995f66a9f71c5ce31aef1d96d5aefc88c5161d.tar.lz nixpkgs-01995f66a9f71c5ce31aef1d96d5aefc88c5161d.tar.xz nixpkgs-01995f66a9f71c5ce31aef1d96d5aefc88c5161d.tar.zst nixpkgs-01995f66a9f71c5ce31aef1d96d5aefc88c5161d.zip | |
Merge pull request #144446 from jkarlson/qemu
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 4e0f459ac28..48b83140e42 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -97,6 +97,19 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu-project/qemu/-/commit/13b250b12ad3c59114a6a17d59caf073ce45b33a.patch"; sha256 = "0lkzfc7gdlvj4rz9wk07fskidaqysmx8911g914ds1jnczgk71mf"; }) + # Fixes a crash that frequently happens in some setups that share /nix/store over 9p like nixos tests + # on some systems. Remove with next release. + (fetchpatch { + name = "fix-crash-in-v9fs_walk.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/f83df00900816476cca41bb536e4d532b297d76e.patch"; + sha256 = "sha256-LYGbBLS5YVgq8Bf7NVk7HBFxXq34NmZRPCEG79JPwk8="; + }) + # Fixes an io error on discard/unmap operation for aio/file backend. Remove with next release. + (fetchpatch { + name = "fix-aio-discard-return-value.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/13a028336f2c05e7ff47dfdaf30dfac7f4883e80.patch"; + sha256 = "sha256-23xVixVl+JDBNdhe5j5WY8CB4MsnUo+sjrkAkG+JS6M="; + }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch ++ lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { |