[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: Revert "gnu: Remove qemu-minimal@2.10."
From: |
guix-commits |
Subject: |
01/07: Revert "gnu: Remove qemu-minimal@2.10." |
Date: |
Sat, 21 Mar 2020 16:38:29 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 18401bdf69b2540b13db86aed199d1ebc585a844
Author: Marius Bakke <address@hidden>
AuthorDate: Sat Mar 21 21:24:28 2020 +0100
Revert "gnu: Remove qemu-minimal@2.10."
This package was still in use by american-fuzzy-lop.
This reverts commit 559f37328851fc1ae1d90f27fab7beff3d804421.
---
gnu/packages/virtualization.scm | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index b7e2c41..03f0cea 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -284,6 +284,34 @@ server and embedded PowerPC, and S390 guests.")
'("libusb" "mesa" "sdl2" "spice" "virglrenderer" "gtk+"
"usbredir" "libdrm" "libepoxy" "pulseaudio" "vde2")))))
+;; The GRUB test suite fails with later versions of Qemu, so we
+;; keep it at 2.10 for now. See
+;; <https://lists.gnu.org/archive/html/bug-grub/2018-02/msg00004.html>.
+;; This package is hidden since we do not backport updates to it.
+(define-public qemu-minimal-2.10
+ (hidden-package
+ (package
+ (inherit qemu-minimal)
+ (version "2.10.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://download.qemu.org/qemu-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "17w21spvaxaidi2am5lpsln8yjpyp2zi3s3gc6nsxj5arlgamzgw"))
+ (patches
+ (search-patches "qemu-glibc-2.27.patch"))))
+ ;; qemu-minimal-2.10 needs Python 2. Remove below once no longer necessary.
+ (native-inputs `(("python-2" ,python-2)
+ ,@(fold alist-delete (package-native-inputs qemu-minimal)
+ '("python-wrapper" "python-sphinx"))))
+ (inputs
+ (fold alist-delete (package-inputs qemu-minimal)
+ ;; Disable seccomp support, because it's not required for the GRUB
+ ;; test suite, and because it fails with libseccomp 2.4.2 and later.
+ '("libseccomp"))))))
+
(define-public libosinfo
(package
(name "libosinfo")
- branch master updated (dde3f55 -> 08c62ac), guix-commits, 2020/03/21
- 03/07: gnu: Add r-httpcode., guix-commits, 2020/03/21
- 01/07: Revert "gnu: Remove qemu-minimal@2.10.",
guix-commits <=
- 04/07: gnu: Add r-latex2exp., guix-commits, 2020/03/21
- 05/07: gnu: Add r-oai., guix-commits, 2020/03/21
- 06/07: gnu: stylish-haskell: Update description., guix-commits, 2020/03/21
- 02/07: gnu: global: Add 'python-wrapper' as input., guix-commits, 2020/03/21
- 07/07: gnu: ghc-stylish-haskell: Deprecate older duplicate package., guix-commits, 2020/03/21