diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-30 10:55:49 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-30 22:38:39 +0100 |
commit | fa38ab91f9565c14f8e8928f97a8f73166d54947 (patch) | |
tree | 2a125c37511c52f1f661d686fae6a002a7a11582 | |
parent | 73e215ccea9b6bf2bd018f32ddced0547e2ce0bf (diff) |
qemu: 8.1.4 -> 8.1.5
-rw-r--r-- | pkgs/applications/virtualization/qemu/default.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 259424d767733..7645527b8d23c 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -53,11 +53,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils"; - version = "8.1.4"; + version = "8.1.5"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-F23W0L3MTHGpQXLRLdt6Oy6OINY45dsmE4Flo4K+Lb0="; + hash = "sha256-l2Ox7+xP1JeWtQgNCINRLXDLY4nq1lxmHMNoalIjKJY="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] @@ -132,11 +132,6 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E="; revert = true; }) - (fetchpatch { - name = "CVE-2023-6693.patch"; - url = "https://gitlab.com/qemu-project/qemu/-/commit/2220e8189fb94068dbad333228659fbac819abb0.patch"; - sha256 = "sha256-uoFFFsVZ8XnsI2GD7xsRFNWghWL7/PSYTc1yhXI6nv4="; - }) ] ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; |