aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2018-02-22 22:14:54 +0200
committerEfraim Flashner <efraim@flashner.co.il>2018-02-22 22:15:21 +0200
commit5c213d1bee60a7e2667feda9b8a2997624e5f447 (patch)
tree55270cb916e28ea5c13fb1bca72ffe1d1e446f3a /gnu
parentcfcc0f3c63077520c8083cac11dab0d16f258155 (diff)
downloadguix-5c213d1bee60a7e2667feda9b8a2997624e5f447.tar
guix-5c213d1bee60a7e2667feda9b8a2997624e5f447.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/bootloaders.scm1
-rw-r--r--gnu/packages/debug.scm2
2 files changed, 2 insertions, 1 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 70b392f3c1..9ea8748a5b 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 09efcbdd6c..2354f0fbb9 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)