mbakke pushed a commit to branch master in repository guix. commit 1c055d72585bd075e20ad0b41942d501d0b38656 Merge: 565e24c ffb4da7 Author: Marius Bakke <mba...@fastmail.com> Date: Tue Oct 10 21:44:32 2017 +0200
Merge branch 'staging' gnu/local.mk | 4 - gnu/packages/admin.scm | 244 +++++++++-------- gnu/packages/algebra.scm | 31 ++- gnu/packages/apr.scm | 25 +- gnu/packages/audio.scm | 191 +++++++------- gnu/packages/backup.scm | 34 +-- gnu/packages/bioinformatics.scm | 258 +++++++++--------- gnu/packages/bittorrent.scm | 33 +-- gnu/packages/cdrom.scm | 2 +- gnu/packages/check.scm | 9 +- gnu/packages/compression.scm | 18 +- gnu/packages/conky.scm | 31 ++- gnu/packages/cups.scm | 40 ++- gnu/packages/curl.scm | 6 +- gnu/packages/databases.scm | 124 +++++---- gnu/packages/debug.scm | 70 ++--- gnu/packages/display-managers.scm | 23 +- gnu/packages/dns.scm | 2 +- gnu/packages/emacs.scm | 74 +++--- gnu/packages/engineering.scm | 43 ++- gnu/packages/firmware.scm | 48 ++-- gnu/packages/flashing-tools.scm | 21 +- gnu/packages/fltk.scm | 42 +-- gnu/packages/fontutils.scm | 27 +- gnu/packages/freedesktop.scm | 51 ++-- gnu/packages/gd.scm | 46 +--- gnu/packages/gkrellm.scm | 5 +- gnu/packages/gl.scm | 25 +- gnu/packages/glib.scm | 41 +-- gnu/packages/gnome.scm | 149 ++++++----- gnu/packages/gprolog.scm | 17 +- gnu/packages/gps.scm | 19 +- gnu/packages/graphics.scm | 13 +- gnu/packages/graphviz.scm | 70 +++-- gnu/packages/gtk.scm | 123 ++++----- gnu/packages/guile-wm.scm | 81 +++--- gnu/packages/guile.scm | 36 +-- gnu/packages/hugs.scm | 61 ++--- gnu/packages/hurd.scm | 60 ++--- gnu/packages/image-viewers.scm | 13 +- gnu/packages/inkscape.scm | 11 + gnu/packages/libcanberra.scm | 18 +- gnu/packages/libevent.scm | 9 +- gnu/packages/linux.scm | 291 ++++++++++----------- gnu/packages/lisp.scm | 61 ++--- gnu/packages/lua.scm | 2 +- gnu/packages/machine-learning.scm | 88 +++---- gnu/packages/mail.scm | 90 +++---- gnu/packages/man.scm | 4 +- gnu/packages/maths.scm | 100 +++---- gnu/packages/messaging.scm | 27 +- gnu/packages/mp3.scm | 87 +++--- gnu/packages/music.scm | 102 ++++---- gnu/packages/noweb.scm | 79 +++--- gnu/packages/patches/bluez-CVE-2017-1000250.patch | 42 --- gnu/packages/patches/gd-fix-gd2-read-test.patch | 14 - .../patches/gd-php-73968-Fix-109-XBM-reading.patch | 121 --------- gnu/packages/patches/gdk-pixbuf-list-dir.patch | 35 --- .../patches/mesa-skip-disk-cache-test.patch | 6 +- gnu/packages/patchutils.scm | 120 ++++----- gnu/packages/pdf.scm | 65 ++--- gnu/packages/perl.scm | 29 +- gnu/packages/photo.scm | 15 +- gnu/packages/php.scm | 2 +- gnu/packages/popt.scm | 17 +- gnu/packages/pretty-print.scm | 65 ++--- gnu/packages/pulseaudio.scm | 4 +- gnu/packages/pumpio.scm | 33 +-- gnu/packages/python.scm | 45 ++-- gnu/packages/rdf.scm | 40 +-- gnu/packages/regex.scm | 20 +- gnu/packages/rrdtool.scm | 19 +- gnu/packages/ruby.scm | 84 +++--- gnu/packages/sawfish.scm | 50 ++-- gnu/packages/scheme.scm | 134 +++++----- gnu/packages/sdl.scm | 46 ++-- gnu/packages/serveez.scm | 15 +- gnu/packages/skribilo.scm | 29 +- gnu/packages/smalltalk.scm | 17 +- gnu/packages/suckless.scm | 4 +- gnu/packages/tcl.scm | 15 +- gnu/packages/telephony.scm | 12 +- gnu/packages/tex.scm | 18 ++ gnu/packages/textutils.scm | 25 +- gnu/packages/time.scm | 20 +- gnu/packages/tor.scm | 14 +- gnu/packages/uucp.scm | 24 +- gnu/packages/video.scm | 23 +- gnu/packages/web-browsers.scm | 10 +- gnu/packages/web.scm | 15 +- gnu/packages/wicd.scm | 214 ++++++++------- gnu/packages/wm.scm | 2 +- gnu/packages/xdisorg.scm | 37 ++- gnu/packages/xfce.scm | 22 +- gnu/packages/xfig.scm | 74 +++--- gnu/packages/xorg.scm | 39 ++- 96 files changed, 2289 insertions(+), 2525 deletions(-) diff --cc gnu/packages/image-viewers.scm index 88c51e1,9d70593..95fb90f --- a/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)