summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-12-17 01:46:23 +0100
committerMarius Bakke <marius@gnu.org>2022-12-17 17:08:51 +0100
commit810b455013037f44801cf1048c81796e77577962 (patch)
tree833a5af8f4bc26cc0950b77fd44413d719cc5717
parentec76f45d30ad24f76a4274d92e79231c3d9bc7de (diff)
downloadguix-810b455013037f44801cf1048c81796e77577962.tar.gz
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.
-rw-r--r--gnu/packages/virtualization.scm11
1 files 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-public qemu
   (package
     (name "qemu")
-    (version "7.1.0")
+    (version "7.2.0")
     (source
      (origin
        (method url-fetch)
@@ -168,7 +168,7 @@
                            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 @@
            ;; 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 @@
                 (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 @@ exec smbd $@")))
            perl
            flex
            bison
-           meson
+           meson-0.63
            ninja
            pkg-config
            python-wrapper