From 810b455013037f44801cf1048c81796e77577962 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 17 Dec 2022 01:46:23 +0100 Subject: [PATCH] gnu: QEMU: Update to 7.2.0. * gnu/packages/virtualization.scm (qemu): Update to 7.2.0. [source](snippet): Don't remove slirp, as it's no longer bundled. [arguments]: Remove related configure-flag. Specify Meson path. [native-inputs]: Change from MESON to MESON-0.63. --- gnu/packages/virtualization.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 1218112a20..6890f13233 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -160,7 +160,7 @@ (define (qemu-patch commit file-name sha256-bv) (define-public qemu (package (name "qemu") - (version "7.1.0") + (version "7.2.0") (source (origin (method url-fetch) @@ -168,7 +168,7 @@ (define-public qemu version ".tar.xz")) (sha256 (base32 - "1rmvrgqjhrvcmchnz170dxvrrf14n6nm39y8ivrprmfydd9lwqx0")) + "0mr1xd78bgp1l61281sdx0338ji0aa68j2p9994sskblhwkcwjav")) (patches (search-patches "qemu-build-info-manual.patch" "qemu-disable-aarch64-migration-test.patch" "qemu-fix-agent-paths.patch")) @@ -178,7 +178,7 @@ (define-public qemu ;; Delete bundled code that we provide externally. ;; TODO: Unbundle SeaBIOS! (for-each delete-file-recursively - '("dtc" "meson" "slirp")))))) + '("dtc" "meson")))))) (outputs '("out" "static" "doc")) ;5.3 MiB of HTML docs (build-system gnu-build-system) (arguments @@ -195,7 +195,8 @@ (define-public qemu (string-append "--host-cc=" gcc) (string-append "--prefix=" out) "--sysconfdir=/etc" - "--enable-slirp=system" + (string-append "--meson=" (search-input-file %build-inputs + "bin/meson")) "--enable-fdt=system" (string-append "--smbd=" out "/libexec/samba-wrapper") "--disable-debug-info" ;for space considerations @@ -371,7 +372,7 @@ (define-public qemu perl flex bison - meson + meson-0.63 ninja pkg-config python-wrapper