[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 6/8] gnu: Order module imports in (gnu packages qemu) alphabetica
From: |
David Craven |
Subject: |
[PATCH 6/8] gnu: Order module imports in (gnu packages qemu) alphabetically. |
Date: |
Fri, 29 Jul 2016 10:23:55 +0200 |
* gnu/packages/qemu.scm: Order module imports alphabetically.
---
gnu/packages/qemu.scm | 67 +++++++++++++++++++++++++--------------------------
1 file changed, 33 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm
index 4d78f9b..6b5a41b 100644
--- a/gnu/packages/qemu.scm
+++ b/gnu/packages/qemu.scm
@@ -19,27 +19,27 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages qemu)
- #:use-module (guix download)
- #:use-module (guix packages)
- #:use-module (guix utils)
- #:use-module ((guix licenses) #:select (gpl2))
- #:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
- #:use-module (gnu packages texinfo)
- #:use-module (gnu packages pkg-config)
- #:use-module (gnu packages glib)
- #:use-module (gnu packages python)
- #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages attr)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages gl)
+ #:use-module (gnu packages glib)
#:use-module (gnu packages image)
- #:use-module (gnu packages attr)
- #:use-module (gnu packages linux)
#:use-module (gnu packages libusb)
- #:use-module (gnu packages xdisorg)
- #:use-module (gnu packages gl)
- #:use-module (gnu packages sdl)
+ #:use-module (gnu packages linux)
+ #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages sdl)
+ #:use-module (gnu packages texinfo)
+ #:use-module (gnu packages xdisorg)
+ #:use-module (guix build-system gnu)
+ #:use-module (guix download)
+ #:use-module ((guix licenses) #:select (gpl2))
+ #:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (srfi srfi-1))
(define (qemu-patch commit file-name sha256)
@@ -118,29 +118,28 @@
(string-append "# " all)))
#t)))))
(inputs ; TODO: Add optional inputs.
- `(("sdl" ,sdl)
- ("mesa" ,mesa)
- ("libusb" ,libusb) ;USB pass-through support
-
- ;; ("libaio" ,libaio)
+ `(("alsa-lib" ,alsa-lib)
+ ("attr" ,attr)
("glib" ,glib)
- ("ncurses" ,ncurses)
- ("libpng" ,libpng)
+ ;; ("libaio" ,libaio)
+ ("libattr" ,attr)
+ ("libcap" ,libcap) ; virtfs support requires libcap & libattr
("libjpeg" ,libjpeg-8)
+ ("libpng" ,libpng)
+ ("libusb" ,libusb) ;USB pass-through support
+ ("mesa" ,mesa)
+ ("ncurses" ,ncurses)
+ ;; ("pciutils" ,pciutils)
("pixman" ,pixman)
- ;; ("vde2" ,vde2)
+ ("sdl" ,sdl)
("util-linux" ,util-linux)
- ("libcap" ,libcap) ; virtfs support requires libcap & libattr
- ("libattr" ,attr)
- ;; ("pciutils" ,pciutils)
- ("alsa-lib" ,alsa-lib)
- ("zlib" ,zlib)
- ("attr" ,attr)))
- (native-inputs `(("pkg-config" ,pkg-config)
+ ;; ("vde2" ,vde2)
+ ("zlib" ,zlib)))
+ (native-inputs `(("glib:bin" ,glib "bin") ; gtester, etc.
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
("python" ,python-2) ; incompatible with Python 3
according to error message
- ("glib" ,glib "bin") ; gtester, etc.
- ("texinfo" ,texinfo)
- ("perl" ,perl)))
+ ("texinfo" ,texinfo)))
(home-page "http://www.qemu-project.org")
(synopsis "Machine emulator and virtualizer")
(description
@@ -175,4 +174,4 @@ server and embedded PowerPC, and S390 guests.")
;; Remove dependencies on optional libraries, notably GUI libraries.
(inputs (fold alist-delete (package-inputs qemu)
- '("sdl" "mesa" "libusb")))))
+ '("libusb" "mesa" "sdl")))))
--
2.9.0