diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-11-21 00:34:32 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-11-21 00:36:23 +0100 |
| commit | 06da1a6b4fa919a64020ebf1a001b7e66134bd97 (patch) | |
| tree | d4ecec28ab52712b5a1753732180350a4d70b282 /gnu/packages/grub.scm | |
| parent | bb38ece4585679c27ecc1f5a063f75dfbf864a45 (diff) | |
| download | guix-06da1a6b4fa919a64020ebf1a001b7e66134bd97.tar guix-06da1a6b4fa919a64020ebf1a001b7e66134bd97.tar.gz | |
gnu: Add qemu-minimal.
* gnu/packages/qemu.scm (qemu): Exchange with former QEMU-HEADLESS.
(qemu-headless): Rename to...
(qemu-minimal): ... this. New variable. Pass --target-list.
* gnu/packages/debug.scm (qemu-2.3.0): Inherit from QEMU-MINIMAL.
* gnu/packages/grub.scm (qemu-for-tests): Likewise.
* gnu/system/vm.scm (expression->derivation-in-linux-vm, qemu-image):
Update to name change.
Diffstat (limited to 'gnu/packages/grub.scm')
| -rw-r--r-- | gnu/packages/grub.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm index 7875a64186..79fc2f0aca 100644 --- a/gnu/packages/grub.scm +++ b/gnu/packages/grub.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> ;;; ;;; This file is part of GNU Guix. @@ -41,7 +41,7 @@ ;; <https://bugs.launchpad.net/bugs/947597> and fixed at ;; <http://bzr.savannah.gnu.org/lh/grub/trunk/grub/revision/4828>. ;; Work around it by using an older QEMU. - (package (inherit qemu-headless) + (package (inherit qemu-minimal) (version "1.3.1") (source (origin (method url-fetch) @@ -55,7 +55,7 @@ ;; ERROR:tests/rtc-test.c:176:check_time: assertion failed (ABS(t - s) <= wiggle): (382597824 <= 2) ;; Simply disable the tests. (arguments `(#:tests? #f - ,@(package-arguments qemu))) + ,@(package-arguments qemu-minimal))) ;; The manual fails to build with Texinfo 5.x. (native-inputs (alist-delete "texinfo" (package-native-inputs qemu))))) |