Merge branch 'staging'

diff --cc gnu/local.mk
Simple merge

diff --cc gnu/packages/admin.scm
Simple merge

diff --cc gnu/packages/audio.scm
Simple merge

diff --cc gnu/packages/backup.scm
Simple merge

diff --cc gnu/packages/check.scm
Simple merge

diff --cc gnu/packages/compression.scm
Simple merge

diff --cc gnu/packages/databases.scm
Simple merge

diff --cc gnu/packages/display-managers.scm
Simple merge

diff --cc gnu/packages/emacs.scm
Simple merge

diff --cc gnu/packages/gnome.scm
Simple merge

diff --cc gnu/packages/guile.scm
Simple merge

diff --cc gnu/packages/image-viewers.scm
index 88c51e1,9d70593..95fb90f
--- 1/gnu/packages/image-viewers.scm
--- 2/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@@ -62,13 -62,13 +62,13 @@@
                                    name "-" version ".tar.bz2"))
                (sha256
                 (base32
 -                "02vhdv16nf4kjna4inpbfy4k3p40bhl7xpc4kh4xvily14146l2b"))))
 +                "0azgpr4al2pi4858z4xh4lfz84cvzxw3n426fn7rz6cdj34q212j"))))
      (build-system gnu-build-system)
      (arguments
-       '(#:phases (alist-delete 'configure %standard-phases)
-         #:tests? #f ;FIXME: Requires 'perl-test-command'.
-         #:make-flags
-           (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")))))
+      '(#:phases (modify-phases %standard-phases (delete 'configure))
+        #:tests? #f ;FIXME: Requires 'perl-test-command'.
+        #:make-flags
+        (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")))))
      (inputs `(("imlib2" ,imlib2)
                ("curl" ,curl)
                ("libpng" ,libpng)

diff --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/mail.scm
Simple merge

diff --cc gnu/packages/maths.scm
Simple merge

diff --cc gnu/packages/perl.scm
Simple merge

diff --cc gnu/packages/python.scm
Simple merge

diff --cc gnu/packages/sdl.scm
Simple merge

diff --cc gnu/packages/video.scm
Simple merge

diff --cc gnu/packages/web.scm
Simple merge

diff --cc gnu/packages/xdisorg.scm
Simple merge

diff --cc gnu/packages/xorg.scm
Simple merge