[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: american-fuzzy-lop: Change custom qemu input.
From: |
Efraim Flashner |
Subject: |
01/01: gnu: american-fuzzy-lop: Change custom qemu input. |
Date: |
Thu, 22 Feb 2018 15:16:01 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit 5c213d1bee60a7e2667feda9b8a2997624e5f447
Author: Efraim Flashner <address@hidden>
Date: Thu Feb 22 22:14:54 2018 +0200
gnu: american-fuzzy-lop: Change custom qemu input.
* gnu/packages/debug.scm (american-fuzzy-lop)[inputs]: Custom-qemu now
inherits from private qemu-minimal-2.10.
* gnu/packages/bootloaders.scm (qemu-minimal-2.10): Add note to move
variable to gnu/packages/debug.scm when no longer needed in
bootloaders.scm.
---
gnu/packages/bootloaders.scm | 1 +
gnu/packages/debug.scm | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 70b392f..9ea8748 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -74,6 +74,7 @@
;; 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>.
+;; TODO: When grub no longer needs this version, move to
gnu/packages/debug.scm.
(define qemu-minimal-2.10
(package
(inherit qemu-minimal)
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index 09efcbd..2354f0f 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -169,7 +169,7 @@ tools that process C/C++ code.")
(inputs
`(("custom-qemu"
;; The afl-qemu tool builds qemu 2.10.0 with a few patches applied.
- ,(package (inherit qemu-minimal)
+ ,(package (inherit (@@ (gnu packages bootloaders) qemu-minimal-2.10))
(name "afl-qemu")
(inputs
`(("afl-src" ,source)