diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-23 00:11:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-23 00:11:32 +0000 |
| commit | b86264453e2db2e15091430dee23e51b448c1e02 (patch) | |
| tree | 7c46f3c7e4d4132b3ead91a5db028aa2f7d26078 /pkgs/applications/virtualization | |
| parent | 8b791af7b14a7797e1bf0b4ca52341a5907eda93 (diff) | |
| parent | 17692eb19fb13be01de375984b3705afc3058fd3 (diff) | |
| download | nixlib-b86264453e2db2e15091430dee23e51b448c1e02.tar nixlib-b86264453e2db2e15091430dee23e51b448c1e02.tar.gz nixlib-b86264453e2db2e15091430dee23e51b448c1e02.tar.bz2 nixlib-b86264453e2db2e15091430dee23e51b448c1e02.tar.lz nixlib-b86264453e2db2e15091430dee23e51b448c1e02.tar.xz nixlib-b86264453e2db2e15091430dee23e51b448c1e02.tar.zst nixlib-b86264453e2db2e15091430dee23e51b448c1e02.zip | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/applications/virtualization')
| -rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 2b183dd48d02..8f22e499d359 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -136,6 +136,15 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/qemu-project/qemu/-/commit/d3671fd972cd185a6923433aa4802f54d8b62112.patch"; sha256 = "sha256-GUh5o7mbFTm/dm6CqcGdoMlC+YrV8RlcEwu/mxrfTzo="; }) + # The next two commits are to make Linux v5.17 work on aarch64-darwin. These are included in QEMU v7. + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/ad99f64f1cfff7c5e7af0e697523d9b7e45423b6.patch"; + sha256 = "sha256-e6WtfQIPEiXhWucd5ab7UIoccbWEAv3bwksn4hR85CY="; + }) + (fetchpatch { + url = "https://gitlab.com/qemu-project/qemu/-/commit/7f6c295cdfeaa229c360cac9a36e4e595aa902ae.patch"; + sha256 = "sha256-mORtgfU1CYQFKO5UrXgM9cJyZxeF2bz8iAoq0UlFQeY="; + }) ./allow-virtfs-on-darwin.patch # QEMU upstream does not demand compatibility to pre-10.13, so 9p-darwin # support on nix requires utimensat fallback. The patch adding this fallback |