diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-13 14:44:06 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-13 15:33:57 +0200 |
| commit | c87ebc1b31cf95b949be488037f212f97f30542d (patch) | |
| tree | 087b719e3b63e250424c3f86e9f9cccd470181f8 /gnu/packages/bootloaders.scm | |
| parent | 245cab2abc1fd74d1df489e500432c66c88f6b25 (diff) | |
| download | guix-patches-c87ebc1b31cf95b949be488037f212f97f30542d.tar guix-patches-c87ebc1b31cf95b949be488037f212f97f30542d.tar.gz | |
gnu: QEMU: Update to 6.0.0.
* gnu/packages/patches/qemu-build-info-manual.patch: Adjust for 6.0.
* gnu/packages/virtualization.scm (qemu): Update to 6.0.0.
[source](snippet): Remove obsolete substitution.
[arguments]: Adjust test substitutions for upstream changes.
* gnu/packages/bootloaders.scm (grub)[source](modules, snippet): New fields.
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 0c10daf9ca..e83f21ea63 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> -;;; Copyright © 2016, 2017, 2018 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2016, 2017, 2018, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2016, 2017 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2016, 2017 David Craven <david@craven.ch> ;;; Copyright © 2017, 2018, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> @@ -97,7 +97,15 @@ "1qbycnxkx07arj9f2nlsi9kp0dyldspbv07ysdyd34qvz55a97mp")) (patches (search-patches "grub-efi-fat-serial-number.patch" - "grub-setup-root.patch")))) + "grub-setup-root.patch")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Adjust QEMU invocation to not use a deprecated device + ;; name that was removed in QEMU 6.0. Remove for >2.06. + (substitute* "tests/ahci_test.in" + (("ide-drive") + "ide-hd")))))) (build-system gnu-build-system) (arguments `(#:configure-flags |