From a7681d29dcb415593a06cf265aabc776bd3a02c0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 6 Apr 2016 23:27:10 +0200 Subject: gnu: pcre: Fix CVE-2016-3191. * gnu/packages/pcre.scm (pcre)[replacement]: New field. (pcre-fixed): New variable. * gnu/packages/patches/pcre-CVE-2016-3191.patch: New file. * gnu-system.am (dist_patch_DATA): Add it. --- gnu/packages/pcre.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages/pcre.scm') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index d2933bbe38..9794def4c1 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -22,6 +22,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (gnu packages compression) #:use-module (gnu packages readline) + #:use-module (gnu packages) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) @@ -30,6 +31,7 @@ (package (name "pcre") (version "8.38") + (replacement pcre-fixed) (source (origin (method url-fetch) (uri (list @@ -65,6 +67,13 @@ POSIX regular expression API.") (license license:bsd-3) (home-page "http://www.pcre.org/"))) +(define pcre-fixed ;for CVE-2016-3191 + (package + (inherit pcre) + (source (origin + (inherit (package-source pcre)) + (patches (list (search-patch "pcre-CVE-2016-3191.patch"))))))) + (define-public pcre2 (package (name "pcre2") -- cgit v1.2.3 From 1ccc3da8d20fc1e36fbf3202ddf6714a2e488533 Mon Sep 17 00:00:00 2001 From: McKinley Olsen Date: Thu, 7 Apr 2016 16:12:24 -0600 Subject: gnu: pcre2: Update to 10.21. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit gnu/packages/pcre.scm (pcre2): Update to 10.21. Signed-off-by: 宋文武 --- gnu/packages/pcre.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/pcre.scm') diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 9794def4c1..9215b38d91 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -77,7 +77,7 @@ POSIX regular expression API.") (define-public pcre2 (package (name "pcre2") - (version "10.20") + (version "10.21") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/pcre/pcre2/" @@ -85,7 +85,7 @@ POSIX regular expression API.") (sha256 (base32 - "0yj8mm9ll9zj3v47rvmmqmr1ybxk72rr2lym3rymdsf905qjhbik")))) + "1q6lrj9b08l1q39vxipb0fi88x6ybvkr6439h8bjb9r8jd81fsn6")))) (build-system gnu-build-system) (inputs `(("bzip2" ,bzip2) ("readline" ,readline) -- cgit v1.2.3 From fc1adab1487e5ea3c5f6341263df14414ba4e784 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Fri, 8 Apr 2016 15:18:13 +0300 Subject: gnu: packages: Use 'search-patches' everywhere. * gnu/packages/abiword.scm: Use 'search-patches' for 'patches' field. * gnu/packages/acl.scm: Likewise. * gnu/packages/admin.scm: Likewise. * gnu/packages/algebra.scm: Likewise. * gnu/packages/animation.scm: Likewise. * gnu/packages/apr.scm: Likewise. * gnu/packages/audacity.scm: Likewise. * gnu/packages/audio.scm: Likewise. * gnu/packages/autotools.scm: Likewise. * gnu/packages/avahi.scm: Likewise. * gnu/packages/backup.scm: Likewise. * gnu/packages/base.scm: Likewise. * gnu/packages/bash.scm: Likewise. * gnu/packages/bioinformatics.scm: Likewise. * gnu/packages/cdrom.scm: Likewise. * gnu/packages/ci.scm: Likewise. * gnu/packages/cmake.scm: Likewise. * gnu/packages/cpio.scm: Likewise. * gnu/packages/cross-base.scm: Likewise. * gnu/packages/dico.scm: Likewise. * gnu/packages/doxygen.scm: Likewise. * gnu/packages/ebook.scm: Likewise. * gnu/packages/elf.scm: Likewise. * gnu/packages/emacs.scm: Likewise. * gnu/packages/engineering.scm: Likewise. * gnu/packages/firmware.scm: Likewise. * gnu/packages/flashing-tools.scm: Likewise. * gnu/packages/fltk.scm: Likewise. * gnu/packages/ftp.scm: Likewise. * gnu/packages/games.scm: Likewise. * gnu/packages/gawk.scm: Likewise. * gnu/packages/gcc.scm: Likewise. * gnu/packages/gd.scm: Likewise. * gnu/packages/ghostscript.scm: Likewise. * gnu/packages/glib.scm: Likewise. * gnu/packages/gnome.scm: Likewise. * gnu/packages/gnucash.scm: Likewise. * gnu/packages/gnunet.scm: Likewise. * gnu/packages/gnupg.scm: Likewise. * gnu/packages/gnuzilla.scm: Likewise. * gnu/packages/graphics.scm: Likewise. * gnu/packages/grub.scm: Likewise. * gnu/packages/gtk.scm: Likewise. * gnu/packages/guile.scm: Likewise. * gnu/packages/icu4c.scm: Likewise. * gnu/packages/idutils.scm: Likewise. * gnu/packages/image.scm: Likewise. * gnu/packages/imagemagick.scm: Likewise. * gnu/packages/irc.scm: Likewise. * gnu/packages/ldc.scm: Likewise. * gnu/packages/libcanberra.scm: Likewise. * gnu/packages/libevent.scm: Likewise. * gnu/packages/libreoffice.scm: Likewise. * gnu/packages/libunwind.scm: Likewise. * gnu/packages/libusb.scm: Likewise. * gnu/packages/linux.scm: Likewise. * gnu/packages/lirc.scm: Likewise. * gnu/packages/llvm.scm: Likewise. * gnu/packages/lsh.scm: Likewise. * gnu/packages/lua.scm: Likewise. * gnu/packages/lxqt.scm: Likewise. * gnu/packages/mail.scm: Likewise. * gnu/packages/maths.scm: Likewise. * gnu/packages/mcrypt.scm: Likewise. * gnu/packages/messaging.scm: Likewise. * gnu/packages/mit-krb5.scm: Likewise. * gnu/packages/mp3.scm: Likewise. * gnu/packages/multiprecision.scm: Likewise. * gnu/packages/music.scm: Likewise. * gnu/packages/ninja.scm: Likewise. * gnu/packages/nvi.scm: Likewise. * gnu/packages/ocaml.scm: Likewise. * gnu/packages/orpheus.scm: Likewise. * gnu/packages/ots.scm: Likewise. * gnu/packages/parallel.scm: Likewise. * gnu/packages/patchutils.scm: Likewise. * gnu/packages/pcre.scm: Likewise. * gnu/packages/pdf.scm: Likewise. * gnu/packages/perl.scm: Likewise. * gnu/packages/plotutils.scm: Likewise. * gnu/packages/polkit.scm: Likewise. * gnu/packages/pulseaudio.scm: Likewise. * gnu/packages/python.scm: Likewise. * gnu/packages/qemu.scm: Likewise. * gnu/packages/qt.scm: Likewise. * gnu/packages/ratpoison.scm: Likewise. * gnu/packages/rdf.scm: Likewise. * gnu/packages/readline.scm: Likewise. * gnu/packages/rush.scm: Likewise. * gnu/packages/scheme.scm: Likewise. * gnu/packages/screen.scm: Likewise. * gnu/packages/sdl.scm: Likewise. * gnu/packages/slim.scm: Likewise. * gnu/packages/ssh.scm: Likewise. * gnu/packages/tcl.scm: Likewise. * gnu/packages/tcsh.scm: Likewise. * gnu/packages/texinfo.scm: Likewise. * gnu/packages/tls.scm: Likewise. * gnu/packages/tor.scm: Likewise. * gnu/packages/tv.scm: Likewise. * gnu/packages/valgrind.scm: Likewise. * gnu/packages/version-control.scm: Likewise. * gnu/packages/video.scm: Likewise. * gnu/packages/vpn.scm: Likewise. * gnu/packages/vtk.scm: Likewise. * gnu/packages/w3m.scm: Likewise. * gnu/packages/web.scm: Likewise. * gnu/packages/wicd.scm: Likewise. * gnu/packages/wm.scm: Likewise. * gnu/packages/xdisorg.scm: Likewise. * gnu/packages/xfce.scm: Likewise. * gnu/packages/xiph.scm: Likewise. * gnu/packages/xml.scm: Likewise. * gnu/packages/xorg.scm: Likewise. * gnu/packages/zip.scm: Likewise. --- gnu/packages/abiword.scm | 5 ++- gnu/packages/acl.scm | 2 +- gnu/packages/admin.scm | 10 +++--- gnu/packages/algebra.scm | 4 +-- gnu/packages/animation.scm | 2 +- gnu/packages/apr.scm | 2 +- gnu/packages/audacity.scm | 2 +- gnu/packages/audio.scm | 4 +-- gnu/packages/autotools.scm | 8 ++--- gnu/packages/avahi.scm | 2 +- gnu/packages/backup.scm | 15 ++++---- gnu/packages/base.scm | 40 ++++++++++----------- gnu/packages/bash.scm | 2 +- gnu/packages/bioinformatics.scm | 9 +++-- gnu/packages/cdrom.scm | 2 +- gnu/packages/ci.scm | 8 ++--- gnu/packages/cmake.scm | 2 +- gnu/packages/cpio.scm | 2 +- gnu/packages/cross-base.scm | 2 +- gnu/packages/dico.scm | 5 ++- gnu/packages/doxygen.scm | 2 +- gnu/packages/ebook.scm | 6 ++-- gnu/packages/elf.scm | 5 ++- gnu/packages/emacs.scm | 9 +++-- gnu/packages/engineering.scm | 14 ++++---- gnu/packages/firmware.scm | 2 +- gnu/packages/flashing-tools.scm | 6 ++-- gnu/packages/fltk.scm | 2 +- gnu/packages/ftp.scm | 7 ++-- gnu/packages/games.scm | 22 ++++++------ gnu/packages/gawk.scm | 2 +- gnu/packages/gcc.scm | 6 ++-- gnu/packages/gd.scm | 5 ++- gnu/packages/ghostscript.scm | 4 +-- gnu/packages/glib.scm | 28 +++++++-------- gnu/packages/gnome.scm | 13 +++---- gnu/packages/gnucash.scm | 2 +- gnu/packages/gnunet.scm | 2 +- gnu/packages/gnupg.scm | 7 ++-- gnu/packages/gnuzilla.scm | 8 ++--- gnu/packages/graphics.scm | 8 ++--- gnu/packages/grub.scm | 6 ++-- gnu/packages/gtk.scm | 10 +++--- gnu/packages/guile.scm | 6 ++-- gnu/packages/icu4c.scm | 6 ++-- gnu/packages/idutils.scm | 3 +- gnu/packages/image.scm | 75 ++++++++++++++++++++-------------------- gnu/packages/imagemagick.scm | 2 +- gnu/packages/irc.scm | 2 +- gnu/packages/ldc.scm | 2 +- gnu/packages/libcanberra.scm | 2 +- gnu/packages/libevent.scm | 2 +- gnu/packages/libreoffice.scm | 2 +- gnu/packages/libunwind.scm | 2 +- gnu/packages/libusb.scm | 2 +- gnu/packages/linux.scm | 22 ++++++------ gnu/packages/lirc.scm | 2 +- gnu/packages/llvm.scm | 2 +- gnu/packages/lsh.scm | 2 +- gnu/packages/lua.scm | 10 +++--- gnu/packages/lxqt.scm | 2 +- gnu/packages/mail.scm | 8 ++--- gnu/packages/maths.scm | 12 +++---- gnu/packages/mcrypt.scm | 2 +- gnu/packages/messaging.scm | 9 +++-- gnu/packages/mit-krb5.scm | 8 ++--- gnu/packages/mp3.scm | 13 ++++--- gnu/packages/multiprecision.scm | 8 ++--- gnu/packages/music.scm | 2 +- gnu/packages/ninja.scm | 4 +-- gnu/packages/nvi.scm | 6 ++-- gnu/packages/ocaml.scm | 3 +- gnu/packages/orpheus.scm | 2 +- gnu/packages/ots.scm | 3 +- gnu/packages/parallel.scm | 4 +-- gnu/packages/patchutils.scm | 3 +- gnu/packages/pcre.scm | 2 +- gnu/packages/pdf.scm | 5 ++- gnu/packages/perl.scm | 18 +++++----- gnu/packages/plotutils.scm | 4 +-- gnu/packages/polkit.scm | 2 +- gnu/packages/pulseaudio.scm | 6 ++-- gnu/packages/python.scm | 39 ++++++++++----------- gnu/packages/qemu.scm | 27 +++++++-------- gnu/packages/qt.scm | 5 ++- gnu/packages/ratpoison.scm | 2 +- gnu/packages/rdf.scm | 7 ++-- gnu/packages/readline.scm | 2 +- gnu/packages/rush.scm | 2 +- gnu/packages/scheme.scm | 8 ++--- gnu/packages/screen.scm | 2 +- gnu/packages/sdl.scm | 2 +- gnu/packages/slim.scm | 6 ++-- gnu/packages/ssh.scm | 4 +-- gnu/packages/tcl.scm | 6 ++-- gnu/packages/tcsh.scm | 2 +- gnu/packages/texinfo.scm | 4 +-- gnu/packages/tls.scm | 5 ++- gnu/packages/tor.scm | 2 +- gnu/packages/tv.scm | 8 ++--- gnu/packages/valgrind.scm | 2 +- gnu/packages/version-control.scm | 14 ++++---- gnu/packages/video.scm | 10 +++--- gnu/packages/vpn.scm | 2 +- gnu/packages/vtk.scm | 2 +- gnu/packages/w3m.scm | 8 ++--- gnu/packages/web.scm | 19 +++++----- gnu/packages/wicd.scm | 10 +++--- gnu/packages/wm.scm | 2 +- gnu/packages/xdisorg.scm | 6 ++-- gnu/packages/xfce.scm | 7 ++-- gnu/packages/xiph.scm | 4 +-- gnu/packages/xml.scm | 6 ++-- gnu/packages/xorg.scm | 25 ++++++-------- gnu/packages/zip.scm | 26 +++++++------- 115 files changed, 402 insertions(+), 448 deletions(-) (limited to 'gnu/packages/pcre.scm') diff --git a/gnu/packages/abiword.scm b/gnu/packages/abiword.scm index eac06ee02e..8e89bb2f52 100644 --- a/gnu/packages/abiword.scm +++ b/gnu/packages/abiword.scm @@ -53,9 +53,8 @@ (sha256 (base32 "1ik591rx15nn3n1297cwykl8wvrlgj78i528id9wbidgy3xzd570")) (patches - (list - (search-patch "abiword-wmf-version-lookup-fix.patch") - (search-patch "abiword-explictly-cast-bools.patch"))))) + (search-patches "abiword-wmf-version-lookup-fix.patch" + "abiword-explictly-cast-bools.patch")))) (build-system gnu-build-system) (arguments ;; NOTE: rsvg is disabled, since Abiword diff --git a/gnu/packages/acl.scm b/gnu/packages/acl.scm index 784186b670..415fae496b 100644 --- a/gnu/packages/acl.scm +++ b/gnu/packages/acl.scm @@ -41,7 +41,7 @@ (sha256 (base32 "08qd9s3wfhv0ajswsylnfwr5h0d7j9d4rgip855nrh400nxp940p")) - (patches (list (search-patch "acl-hurd-path-max.patch"))))) + (patches (search-patches "acl-hurd-path-max.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; FIXME: Investigate test suite failures diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 406aa0eece..11a2d1622b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -797,7 +797,7 @@ system administrator.") (sha256 (base32 "0263gi6i19fyzzc488n0qw3m518i39f6a7qmrfvahk9j10bkh5j3")) - (patches (list (search-patch "sudo-CVE-2015-5602.patch"))))) + (patches (search-patches "sudo-CVE-2015-5602.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -871,10 +871,10 @@ commands and their arguments.") (base32 "05mkp5bx1c3z7h5biddsv0p49gkrq9ksany3anp4wdiv92p5prfc")) (patches - (map search-patch '("wpa-supplicant-CVE-2015-5310.patch" - "wpa-supplicant-CVE-2015-5314.patch" - "wpa-supplicant-CVE-2015-5315.patch" - "wpa-supplicant-CVE-2015-5316.patch"))))) + (search-patches "wpa-supplicant-CVE-2015-5310.patch" + "wpa-supplicant-CVE-2015-5314.patch" + "wpa-supplicant-CVE-2015-5315.patch" + "wpa-supplicant-CVE-2015-5316.patch")))) (build-system gnu-build-system) (arguments '(#:phases (alist-replace diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 78e078fbd2..5b0049330a 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -270,7 +270,7 @@ or text interfaces) or as a C++ library.") version ".tar.gz")) (sha256 (base32 "11syazv1a8rrnac3wj3hnyhhflpqcmq02q8pqk2m6g2k6h0gxwfb")) - (patches (map search-patch '("flint-ldconfig.patch"))))) + (patches (search-patches "flint-ldconfig.patch")))) (build-system gnu-build-system) (propagated-inputs `(("gmp" ,gmp) @@ -319,7 +319,7 @@ fast arithmetic.") (sha256 (base32 "04hhcpshfkcq9fr4hixbhpps50yf9drk62xgkvlcaj5kb4nyrx7l")) - (patches (map search-patch '("arb-ldconfig.patch"))))) + (patches (search-patches "arb-ldconfig.patch")))) (build-system gnu-build-system) (propagated-inputs `(("flint" ,flint))) ; flint.h is included by arf.h diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 789bb6e6f2..077657937d 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -68,7 +68,7 @@ C++ @dfn{Standard Template Library} (STL).") (sha256 (base32 "1d3z2r78j3rkff47q3wl0ami69y3l4nyi5r9zclymb8ar7mgkk9l")) - (patches (list (search-patch "synfig-build-fix.patch"))))) + (patches (search-patches "synfig-build-fix.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm index 8c57ee3ab2..17945c0390 100644 --- a/gnu/packages/apr.scm +++ b/gnu/packages/apr.scm @@ -39,7 +39,7 @@ (base32 "0ypn51xblix5ys9xy7da3ngdydip0qqh9rdq8nz54w9aq8lys0vx")) (patches - (list (search-patch "apr-skip-getservbyname-test.patch"))) + (search-patches "apr-skip-getservbyname-test.patch")) (patch-flags '("-p0")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/audacity.scm b/gnu/packages/audacity.scm index 53cc2a497e..9eae6aa1aa 100644 --- a/gnu/packages/audacity.scm +++ b/gnu/packages/audacity.scm @@ -47,7 +47,7 @@ "mirror://sourceforge/audacity/audacity-minsrc-" version ".tar.xz")) (sha256 (base32 "1cs2w3fwqylpqmfwkvlgdx5lhclpckfil7pqibl37qlbnf4qvndh")) - (patches (list (search-patch "audacity-fix-ffmpeg-binding.patch"))))) + (patches (search-patches "audacity-fix-ffmpeg-binding.patch")))) (build-system gnu-build-system) (inputs ;; TODO: Add portSMF and libwidgetextra once they're packaged. In-tree diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 204e0a435c..cdcb61afee 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -333,7 +333,7 @@ tools (analyzer, mono/stereo tools, crossovers).") (sha256 (base32 "0a1sni6lr7qpwywpggbkp0ia3h9bwwgf9i87gsag8ra2h30v82hd")) - (patches (list (search-patch "csound-header-ordering.patch"))))) + (patches (search-patches "csound-header-ordering.patch")))) (build-system cmake-build-system) (arguments ;; Work around this error on x86_64 with libc 2.22+: @@ -2064,7 +2064,7 @@ portions of LAME.") ".tgz")) (sha256 (base32 "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g")) - (patches (list (search-patch "portaudio-audacity-compat.patch"))))) + (patches (search-patches "portaudio-audacity-compat.patch")))) (build-system gnu-build-system) (inputs ;; TODO: Add ASIHPI. diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 598624ccdc..ddc628d005 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -195,9 +195,8 @@ output is indexed in many ways to simplify browsing.") (base32 "0dl6vfi2lzz8alnklwxzfz624b95hb1ipjvd3mk177flmddcf24r")) (patches - (map search-patch - '("automake-regexp-syntax.patch" - "automake-skip-amhello-tests.patch"))))) + (search-patches "automake-regexp-syntax.patch" + "automake-skip-amhello-tests.patch")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,(autoconf-wrapper)) @@ -273,8 +272,7 @@ Makefile, simplifying the entire process for the developer.") (sha256 (base32 "0vxj52zm709125gwv9qqlw02silj8bnjnh4y07arrz60r31ai1vw")) - (patches - (list (search-patch "libtool-skip-tests2.patch"))))) + (patches (search-patches "libtool-skip-tests2.patch")))) (build-system gnu-build-system) (propagated-inputs `(("m4" ,m4))) (native-inputs `(("m4" ,m4) diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 2d480192af..5740ab2ff8 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -41,7 +41,7 @@ (sha256 (base32 "0j5b5ld6bjyh3qhd2nw0jb84znq0wqai7fsrdzg7bpg24jdp2wl3")) - (patches (list (search-patch "avahi-localstatedir.patch"))))) + (patches (search-patches "avahi-localstatedir.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-distro=none" diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 619c5cb57a..4bdb9ca059 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -61,8 +61,8 @@ (sha256 (base32 "0jh79syhr8n3l81jxlwsmwm1pklb4d923m2lgqbswyavh1fqmvwb")) - (patches (list (search-patch "duplicity-piped-password.patch") - (search-patch "duplicity-test_selection-tmp.patch"))))) + (patches (search-patches "duplicity-piped-password.patch" + "duplicity-test_selection-tmp.patch")))) (build-system python-build-system) (native-inputs `(("python2-setuptools" ,python2-setuptools) @@ -146,10 +146,10 @@ backups (called chunks) to allow easy burning to CD/DVD.") (base32 "0pixqnrcf35dnqgv0lp7qlcw7k13620qkhgxr288v7p4iz6ym1zb")) (patches - (list (search-patch "libarchive-mtree-filename-length-fix.patch") - (search-patch "libarchive-fix-lzo-test-case.patch") - (search-patch "libarchive-CVE-2013-0211.patch") - (search-patch "libarchive-bsdtar-test.patch"))))) + (search-patches "libarchive-mtree-filename-length-fix.patch" + "libarchive-fix-lzo-test-case.patch" + "libarchive-CVE-2013-0211.patch" + "libarchive-bsdtar-test.patch")))) (build-system gnu-build-system) ;; TODO: Add -L/path/to/nettle in libarchive.pc. (inputs @@ -377,8 +377,7 @@ changes are stored.") (sha256 (base32 "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g")) - (patches - (list (search-patch "diffutils-gets-undeclared.patch"))))) + (patches (search-patches "diffutils-gets-undeclared.patch")))) (build-system gnu-build-system) (native-inputs `(("guile" ,guile-2.0) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e6628277a6..1c4ebbf64f 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -82,8 +82,7 @@ command-line arguments, multiple languages, and so on.") (sha256 (base32 "1srn321x7whlhs5ks36zlcrrmj4iahll8fxwsh1vbz3v04px54fa")) - (patches - (list (search-patch "grep-timing-sensitive-test.patch"))))) + (patches (search-patches "grep-timing-sensitive-test.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) ;some of the tests require it (synopsis "Print lines matching a pattern") @@ -109,7 +108,7 @@ including, for example, recursive directory searching.") (sha256 (base32 "1myvrmh99jsvk7v3d7crm0gcrq51hmmm1r2kjyyci152in1x2j7h")) - (patches (list (search-patch "sed-hurd-path-max.patch"))))) + (patches (search-patches "sed-hurd-path-max.patch")))) (build-system gnu-build-system) (synopsis "Stream editor") (arguments @@ -145,9 +144,8 @@ implementation offers several extensions over the standard utility.") (sha256 (base32 "1wi2zwm4c9r3h3b8y4w0nm0qq897kn8kyj9k22ba0iqvxj48vvk4")) - (patches (map search-patch - '("tar-d_ino_in_dirent-fix.patch" - "tar-skip-unreliable-tests.patch"))))) + (patches (search-patches "tar-d_ino_in_dirent-fix.patch" + "tar-skip-unreliable-tests.patch")))) (build-system gnu-build-system) (synopsis "Managing tar archives") (description @@ -171,7 +169,7 @@ standard utility.") (sha256 (base32 "16d2r9kpivaak948mxzc0bai45mqfw73m113wrkmbffnalv1b5gx")) - (patches (list (search-patch "patch-hurd-path-max.patch"))))) + (patches (search-patches "patch-hurd-path-max.patch")))) (build-system gnu-build-system) (native-inputs `(("ed" ,ed))) (synopsis "Apply differences to originals, with optional backups") @@ -217,9 +215,8 @@ interactive means to merge two files.") (sha256 (base32 "178nn4dl7wbcw499czikirnkniwnx36argdnqgz4ik9i6zvwkm6y")) - (patches (map search-patch - '("findutils-localstatedir.patch" - "findutils-test-xargs.patch"))))) + (patches (search-patches "findutils-localstatedir.patch" + "findutils-test-xargs.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list @@ -325,7 +322,7 @@ functionality beyond that which is outlined in the POSIX standard.") (sha256 (base32 "19gwwhik3wdwn0r42b7xcihkbxvjl9r2bdal8nifc3k5i4rn3iqb")) - (patches (list (search-patch "make-impure-dirs.patch"))))) + (patches (search-patches "make-impure-dirs.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) ; to detect Guile (inputs `(("guile" ,guile-2.0))) @@ -363,8 +360,8 @@ change. GNU make offers many powerful extensions over the standard utility.") (sha256 (base32 "08lzmhidzc16af1zbx34f8cy4z7mzrswpdbhrb8shy3xxpflmcdm")) - (patches (list (search-patch "binutils-ld-new-dtags.patch") - (search-patch "binutils-loongson-workaround.patch"))))) + (patches (search-patches "binutils-ld-new-dtags.patch" + "binutils-loongson-workaround.patch")))) (build-system gnu-build-system) ;; TODO: Add dependency on zlib + those for Gold. @@ -484,12 +481,12 @@ store.") (("use_ldconfig=yes") "use_ldconfig=no"))) (modules '((guix build utils))) - (patches (map search-patch - '("glibc-ldd-x86_64.patch" - "glibc-locale-incompatibility.patch" - "glibc-versioned-locpath.patch" - "glibc-o-largefile.patch" - "glibc-CVE-2015-7547.patch"))))) + (patches + (search-patches "glibc-ldd-x86_64.patch" + "glibc-locale-incompatibility.patch" + "glibc-versioned-locpath.patch" + "glibc-o-largefile.patch" + "glibc-CVE-2015-7547.patch")))) (build-system gnu-build-system) ;; Glibc's refers to , for instance, so glibc @@ -659,7 +656,7 @@ with the Linux kernel.") (sha256 (base32 "1f135546j34s9bfkydmx2nhh9vwxlx60jldi80zmsnln6wj3dsxf")) - (patches (list (search-patch "glibc-ldd-x86_64.patch"))))))) + (patches (search-patches "glibc-ldd-x86_64.patch")))))) (define-public glibc-locales (package @@ -779,8 +776,7 @@ command.") (base32 "17gsh0kaz0zyvghjmx861mi2p65m9901lngi179x61zm6v2v3xc4")) (file-name (string-append name "-" version)) - (patches (map search-patch - '("glibc-hurd-extern-inline.patch"))))) + (patches (search-patches "glibc-hurd-extern-inline.patch")))) ;; Libc provides , which includes a bunch of Hurd and Mach headers, ;; so both should be propagated. diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 15909c7e88..cad66da70b 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -285,7 +285,7 @@ without modification.") (base32 "0kxf8s5bw7y50x0ksb77d3kv0dwadixhybl818w27y6mlw26hq1b")) (patches - (list (search-patch "bash-completion-directories.patch"))))) + (search-patches "bash-completion-directories.patch")))) (build-system gnu-build-system) (native-inputs `(("util-linux" ,util-linux))) (arguments diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index da4a2d5eba..b76aadc6a2 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -716,7 +716,7 @@ gapped, local, and paired-end alignment modes.") (sha256 (base32 "168zlzykq622zbgkh90a90f1bdgsxkscq2zxzbj8brq80hbjpyp7")) - (patches (list (search-patch "tophat-build-with-later-seqan.patch"))) + (patches (search-patches "tophat-build-with-later-seqan.patch")) (modules '((guix build utils))) (snippet '(begin @@ -1156,8 +1156,7 @@ time.") "07y179f63d7qnzdvkqcziwk9bs3k4zhp81q392fp1hwszjdvy22f")) ;; This patch has been sent upstream already and is available ;; for download from Sourceforge, but it has not been merged. - (patches (list - (search-patch "crossmap-allow-system-pysam.patch"))) + (patches (search-patches "crossmap-allow-system-pysam.patch")) (modules '((guix build utils))) ;; remove bundled copy of pysam (snippet @@ -2722,7 +2721,7 @@ partial genes, and identifies translation initiation sites.") version ".tar.gz")) (sha256 (base32 "0nzdc0j0hjllhsd5f2xli95dafm3nawskigs140xzvjk67xh0r9q")) - (patches (list (search-patch "rsem-makefile.patch"))) + (patches (search-patches "rsem-makefile.patch")) (modules '((guix build utils))) (snippet '(begin @@ -3129,7 +3128,7 @@ accessed/downloaded on demand across HTTP.") version "-src.zip")) (sha256 (base32 "0as8gxm4pjyc8dxmm1sl873rrd7wn5qs0l29nqfnl31x8i467xaa")) - (patches (list (search-patch "plink-1.07-unclobber-i.patch"))))) + (patches (search-patches "plink-1.07-unclobber-i.patch")))) (build-system gnu-build-system) (arguments '(#:tests? #f ;no "check" target diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 46a5b234aa..4eff2d5cb0 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -164,7 +164,7 @@ files.") (sha256 (base32 "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80")) - (patches (list (search-patch "cdparanoia-fpic.patch"))) + (patches (search-patches "cdparanoia-fpic.patch")) (modules '((guix build utils))) (snippet ;; Make libraries respect LDFLAGS. diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 5ab03c7652..be18ebd29f 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -52,10 +52,10 @@ (sha256 (base32 "08vc76xb7f42hh65j7qvjf58hw36aki5ml343170pq94vk75b1nh")) - (patches (map search-patch - '("hydra-automake-1.15.patch" - ;; TODO: Remove once we have a darcs input - "hydra-disable-darcs-test.patch"))))) + (patches (search-patches + "hydra-automake-1.15.patch" + ;; TODO: Remove once we have a darcs input + "hydra-disable-darcs-test.patch")))) (build-system gnu-build-system) (native-inputs `(("unzip" ,unzip) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index d75b9f62ef..1cb1e06993 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -45,7 +45,7 @@ (sha256 (base32 "08pwy9ip9cgwgynhn5vrjw8drw29gijy1rmziq22n65zds6ifnp7")) - (patches (list (search-patch "cmake-fix-tests.patch"))))) + (patches (search-patches "cmake-fix-tests.patch")))) (build-system gnu-build-system) (arguments `(#:test-target "test" diff --git a/gnu/packages/cpio.scm b/gnu/packages/cpio.scm index e8eede6524..77a0c82d2e 100644 --- a/gnu/packages/cpio.scm +++ b/gnu/packages/cpio.scm @@ -36,7 +36,7 @@ (sha256 (base32 "0vi9q475h1rki53100zml75vxsykzyhrn70hidy41s5c2rc8r6bh")) - (patches (list (search-patch "cpio-CVE-2016-2037.patch"))))) + (patches (search-patches "cpio-CVE-2016-2037.patch")))) (build-system gnu-build-system) (home-page "https://www.gnu.org/software/cpio/") (synopsis "Manage cpio and tar file archives") diff --git a/gnu/packages/cross-base.scm b/gnu/packages/cross-base.scm index 8bd599c25a..aa67d21c19 100644 --- a/gnu/packages/cross-base.scm +++ b/gnu/packages/cross-base.scm @@ -201,7 +201,7 @@ may be either a libc package or #f.)" "Return GCC patches needed for TARGET." (cond ((string-prefix? "xtensa-" target) ;; Patch by Qualcomm needed to build the ath9k-htc firmware. - (list (search-patch "ath9k-htc-firmware-gcc.patch"))) + (search-patches "ath9k-htc-firmware-gcc.patch")) (else '()))) (define* (cross-gcc target diff --git a/gnu/packages/dico.scm b/gnu/packages/dico.scm index 317eeeebea..780d8efcc7 100644 --- a/gnu/packages/dico.scm +++ b/gnu/packages/dico.scm @@ -43,9 +43,8 @@ (sha256 (base32 "04pjks075x20d19l623mj50bw64g8i41s63z4kzzqcbg9qg96x64")) - (patches (map search-patch - '("cpio-gets-undeclared.patch" - "dico-libtool-deterministic.patch"))))) + (patches (search-patches "cpio-gets-undeclared.patch" + "dico-libtool-deterministic.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags (list (string-append "--with-guile-site-dir=" %output diff --git a/gnu/packages/doxygen.scm b/gnu/packages/doxygen.scm index 8245a65c86..8e4cbb936c 100644 --- a/gnu/packages/doxygen.scm +++ b/gnu/packages/doxygen.scm @@ -40,7 +40,7 @@ (sha256 (base32 "0ja02pm3fpfhc5dkry00kq8mn141cqvdqqpmms373ncbwi38pl35")) - (patches (list (search-patch "doxygen-test.patch"))))) + (patches (search-patches "doxygen-test.patch")))) (build-system cmake-build-system) (native-inputs `(("bison" ,bison) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index bf7fe70772..f972d8831f 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -50,7 +50,7 @@ (sha256 (base32 "18zzb4x3z0d7fjh1x5439bs62dmgsi4c1pg3qyr7h5gp1i5xcj9l")) - (patches (list (search-patch "chmlib-inttypes.patch"))))) + (patches (search-patches "chmlib-inttypes.patch")))) (build-system gnu-build-system) (home-page "http://www.jedrea.com/chmlib/") (synopsis "Library for CHM files") @@ -77,8 +77,8 @@ '(begin (delete-file-recursively "src/unrar") (delete-file "src/odf/thumbnail.py"))) - (patches (list (search-patch "calibre-drop-unrar.patch") - (search-patch "calibre-no-updates-dialog.patch"))))) + (patches (search-patches "calibre-drop-unrar.patch" + "calibre-no-updates-dialog.patch")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index cb456af195..82604c4e30 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -39,8 +39,7 @@ (sha256 (base32 "0w50szymyqvx8g0vkwrvnv17grqxva6x1z9dm9m3i99zg2hr232p")) - (patches - (list (search-patch "elfutils-tests-ptrace.patch"))))) + (patches (search-patches "elfutils-tests-ptrace.patch")))) (build-system gnu-build-system) ;; Separate programs because that's usually not what elfutils users want, @@ -108,7 +107,7 @@ addr2line, and more.") (sha256 (base32 "1rqpg84wrd3fa16wa9vqdvasnc05yz49w207cz1l0wrl4k8q97y9")) - (patches (list (search-patch "patchelf-page-size.patch"))))) + (patches (search-patches "patchelf-page-size.patch")))) (build-system gnu-build-system) ;; XXX: The upstream 'patchelf' doesn't support ARM. The only available diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index c8283ca441..188824a48b 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -76,8 +76,8 @@ (sha256 (base32 "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx")) - (patches (list (search-patch "emacs-exec-path.patch") - (search-patch "emacs-source-date-epoch.patch"))))) + (patches (search-patches "emacs-exec-path.patch" + "emacs-source-date-epoch.patch")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases @@ -1308,7 +1308,7 @@ on context.") (base32 "141wn9l0m33w0g3dqmx8nxbfdny1r5xbr6ak61rsz21bk0qafs7x")) (patches - (list (search-patch "emacs-scheme-complete-scheme-r5rs-info.patch"))))) + (search-patches "emacs-scheme-complete-scheme-r5rs-info.patch")))) (build-system emacs-build-system) (home-page "https://github.com/ashinn/scheme-complete") (synopsis "Smart tab completion for Scheme in Emacs") @@ -1385,8 +1385,7 @@ identifiers in the MIT-Scheme documentation.") (file-name (string-append name "-" version ".el")) (method uncompressed-file-fetch) (uri "https://staff.fnwi.uva.nl/c.dominik/Tools/constants/constants.el") - (patches - (list (search-patch "emacs-constants-lisp-like.patch"))) + (patches (search-patches "emacs-constants-lisp-like.patch")) (sha256 (base32 "14q094aphsjhq8gklv7i5a7byl0ygz63cv3n6b5p8ji2jy0mnnw3")))) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 9a299d91c8..c519ca59e7 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -232,8 +232,8 @@ optimizer; and it can produce photorealistic and design review images.") (modules '((guix build utils) (guix build download) (guix ftp-client))) - (patches (list (search-patch "fastcap-mulSetup.patch") - (search-patch "fastcap-mulGlobal.patch"))))) + (patches (search-patches "fastcap-mulSetup.patch" + "fastcap-mulGlobal.patch")))) (build-system gnu-build-system) (native-inputs `(("texlive" ,texlive) @@ -329,11 +329,11 @@ multipole-accelerated algorithm.") "-" version ".tar.z")) (sha256 (base32 "1a06xyyd40zhknrkz17xppl2zd5ig4w9g1grc8qrs0zqqcl5hpzi")) - (patches (list (search-patch "fasthenry-spAllocate.patch") - (search-patch "fasthenry-spBuild.patch") - (search-patch "fasthenry-spUtils.patch") - (search-patch "fasthenry-spSolve.patch") - (search-patch "fasthenry-spFactor.patch"))))) + (patches (search-patches "fasthenry-spAllocate.patch" + "fasthenry-spBuild.patch" + "fasthenry-spUtils.patch" + "fasthenry-spSolve.patch" + "fasthenry-spFactor.patch")))) (build-system gnu-build-system) (arguments `(#:make-flags '("CC=gcc" "RM=rm" "SHELL=sh" "all") diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 271fb49dd7..45b7bf7ab1 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -39,7 +39,7 @@ (base32 "16jbj8avg5jkgvq5lxm0hdxxn4c3zn7fx8b4nxllvr024apk9w23")) (file-name (string-append name "-" version "-checkout")) - (patches (list (search-patch "ath9k-htc-firmware-objcopy.patch"))))) + (patches (search-patches "ath9k-htc-firmware-objcopy.patch")))) (build-system gnu-build-system) (arguments '(#:phases (alist-cons-before diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 194ed380bb..9f9f1b9c6a 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -44,7 +44,7 @@ (sha256 (base32 "1s9pc4yls2s1gcg2ar4q75nym2z5v6lxq36bl6lq26br00nj2mas")) - (patches (list (search-patch "flashrom-use-libftdi1.patch"))))) + (patches (search-patches "flashrom-use-libftdi1.patch")))) (build-system gnu-build-system) (inputs `(("dmidecode" ,dmidecode) ("pciutils" ,pciutils) @@ -88,7 +88,7 @@ programmer devices.") (sha256 (base32 "0frxg0q09nrm95z7ymzddx7ysl77ilfbdix1m81d9jjpiv5bm64y")) - (patches (list (search-patch "avrdude-fix-libusb.patch"))))) + (patches (search-patches "avrdude-fix-libusb.patch")))) (build-system gnu-build-system) (inputs `(("libelf" ,libelf) @@ -117,7 +117,7 @@ technique (ISP).") (sha256 (base32 "15gr99y1z9vbvhrkd25zqhnzhg6zjmaam3vfjzf2mazd39mx7d0x")) - (patches (list (search-patch "dfu-programmer-fix-libusb.patch"))))) + (patches (search-patches "dfu-programmer-fix-libusb.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm index 0629d41c0c..4dec9bc288 100644 --- a/gnu/packages/fltk.scm +++ b/gnu/packages/fltk.scm @@ -46,7 +46,7 @@ (sha256 (base32 "15qd7lkz5d5ynz70xhxhigpz3wns39v9xcf7ggkl0792syc8sfgq")) - (patches (list (search-patch "fltk-shared-lib-defines.patch"))))) + (patches (search-patches "fltk-shared-lib-defines.patch")))) (build-system gnu-build-system) (inputs `(("libjpeg" ,libjpeg-8) ;jpeg_read_header argument error in libjpeg-9 diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index acd69adcd0..4c2d893c17 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -43,9 +43,8 @@ (sha256 (base32 "1grmp8zg7cjgjinz66mrh53whigkqzl90nlxj05hapnhk3ns3vni")) - (patches - (list (search-patch - "lftp-dont-save-unknown-host-fingerprint.patch"))))) + (patches (search-patches + "lftp-dont-save-unknown-host-fingerprint.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -126,7 +125,7 @@ FTP browser, as well as non-interactive commands such as 'ncftpput' and (sha256 (base32 "0f5cj5p852wkm24mzy2sxgxyahv2p9rk4wlq21j310pi7wlhgwyl")) - (patches (list (search-patch "weex-vacopy.patch"))))) + (patches (search-patches "weex-vacopy.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 653e0c7206..3fb30af9e2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -220,7 +220,7 @@ that beneath its ruins lay buried an ancient evil.") (sha256 (base32 "0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m")) - (patches (list (search-patch "pingus-sdl-libs-config.patch"))))) + (patches (search-patches "pingus-sdl-libs-config.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("scons" ,scons))) @@ -598,8 +598,8 @@ for common mesh file formats, and collision detection.") (sha256 (base32 "1r4c5gap1z2zsv4yjd34qriqkxaq4lb4rykapyzkkdf4g36lc3nh")) - (patches (list (search-patch "mars-sfml-2.3.patch") - (search-patch "mars-install.patch"))))) + (patches (search-patches "mars-sfml-2.3.patch" + "mars-install.patch")))) (build-system cmake-build-system) (arguments `(#:tests? #f ; There are no tests @@ -1709,8 +1709,7 @@ Z64 video plugin.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "04qkpd8ic7xsgnqz7spl00wxdygf79m7d1k8rabbygjk5lg6p8z2")) - (patches - (list (search-patch "mupen64plus-ui-console-notice.patch"))))) + (patches (search-patches "mupen64plus-ui-console-notice.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -1871,12 +1870,11 @@ and a game metadata scraper.") (sha256 (base32 "1f2whlrfidwfh8lvr8cspcyirc6840r5d1ajm7x99qmngygrhixs")) - (patches (map search-patch - '("pinball-const-fix.patch" - "pinball-cstddef.patch" - "pinball-missing-separators.patch" - "pinball-src-deps.patch" - "pinball-system-ltdl.patch"))))) + (patches (search-patches "pinball-const-fix.patch" + "pinball-cstddef.patch" + "pinball-missing-separators.patch" + "pinball-src-deps.patch" + "pinball-system-ltdl.patch")))) (build-system gnu-build-system) (inputs `(("glu" ,glu) @@ -1965,7 +1963,7 @@ players.") (sha256 (base32 "1hxrlv6n8py48j487i6wbb4n4vd55w0na69r7ccmmr9vmrsw5mlk")) - (patches (list (search-patch "einstein-build.patch"))))) + (patches (search-patches "einstein-build.patch")))) (build-system gnu-build-system) (inputs `(("freetype" ,freetype) diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 8f2805cd4b..c6d322b708 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -36,7 +36,7 @@ ".tar.xz")) (sha256 (base32 "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3")) - (patches (list (search-patch "gawk-fts-test.patch"))))) + (patches (search-patches "gawk-fts-test.patch")))) (build-system gnu-build-system) (arguments `(#:parallel-tests? #f ; test suite fails in parallel diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 1df5150ab3..a2b8126872 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -328,7 +328,7 @@ Go. It also includes runtime support libraries for these languages.") (sha256 (base32 "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2")) - (patches (list (search-patch "gcc-arm-link-spec-fix.patch"))))))) + (patches (search-patches "gcc-arm-link-spec-fix.patch")))))) (define-public gcc-4.9 (package (inherit gcc-4.8) @@ -340,7 +340,7 @@ Go. It also includes runtime support libraries for these languages.") (sha256 (base32 "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3")) - (patches (list (search-patch "gcc-libvtv-runpath.patch"))))))) + (patches (search-patches "gcc-libvtv-runpath.patch")))))) (define-public gcc-5 (package (inherit gcc-4.9) @@ -352,7 +352,7 @@ Go. It also includes runtime support libraries for these languages.") (sha256 (base32 "1ny4smkp5bzs3cp8ss7pl6lk8yss0d9m4av1mvdp72r1x695akxq")) - (patches (list (search-patch "gcc-5.0-libvtv-runpath.patch"))))))) + (patches (search-patches "gcc-5.0-libvtv-runpath.patch")))))) ;; Note: When changing the default gcc version, update ;; the gcc-toolchain-* definitions accordingly. diff --git a/gnu/packages/gd.scm b/gnu/packages/gd.scm index 55caac9b29..6ae5579b9c 100644 --- a/gnu/packages/gd.scm +++ b/gnu/packages/gd.scm @@ -83,9 +83,8 @@ most common applications of GD involve website development.") (sha256 (base32 "1ya8f9hpiax8j29vwaiwlvvgah0vkyvpzva28r8231nyk0f3s40z")) - (patches - (list - (search-patch "perl-gd-options-passthrough-and-fontconfig.patch"))))) + (patches (search-patches + "perl-gd-options-passthrough-and-fontconfig.patch")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) ;needs Module::Build >= 0.42 diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 88f24209c8..0a65813f97 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -133,8 +133,8 @@ printing, and psresize, for adjusting page sizes.") (sha256 (base32 "0q4jj41p0qbr4mgcc9q78f5zs8cm1g57wgryhsm2yq4lfslm3ib1")) - (patches (map search-patch '("ghostscript-CVE-2015-3228.patch" - "ghostscript-runpath.patch"))) + (patches (search-patches "ghostscript-CVE-2015-3228.patch" + "ghostscript-runpath.patch")) (modules '((guix build utils))) (snippet ;; Honor --docdir. diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 16a1a6162d..e7e9df8dff 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -68,8 +68,7 @@ (sha256 (base32 "0jwj7wlrhq5y0fwfh8k2d9rgdpfax06lj8698g6iqbwrzd2rgyqx")) - (patches - (list (search-patch "dbus-helper-search-path.patch"))))) + (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags @@ -139,11 +138,11 @@ shared NFS home directories.") (sha256 (base32 "1yzxr1ip3l0m9ydk5nq32piq70c9f17p5f0jyvlsghzbaawh67ss")) - (patches (list (search-patch "glib-tests-homedir.patch") - (search-patch "glib-tests-desktop.patch") - (search-patch "glib-tests-prlimit.patch") - (search-patch "glib-tests-timer.patch") - (search-patch "glib-tests-gapplication.patch"))))) + (patches (search-patches "glib-tests-homedir.patch" + "glib-tests-desktop.patch" + "glib-tests-prlimit.patch" + "glib-tests-timer.patch" + "glib-tests-gapplication.patch")))) (build-system gnu-build-system) (outputs '("out" ; everything "bin" ; glib-mkenums, gtester, etc.; depends on Python @@ -231,12 +230,10 @@ dynamic loading, and an object system.") (snippet '(substitute* "tools/g-ir-tool-template.in" (("#!/usr/bin/env @PYTHON@") "#!@PYTHON@"))) - (patches (list - (search-patch "gobject-introspection-cc.patch") - (search-patch - "gobject-introspection-girepository.patch") - (search-patch - "gobject-introspection-absolute-shlib-path.patch"))))) + (patches (search-patches + "gobject-introspection-cc.patch" + "gobject-introspection-girepository.patch" + "gobject-introspection-absolute-shlib-path.patch")))) (build-system gnu-build-system) (inputs `(("bison" ,bison) @@ -479,9 +476,8 @@ useful for C++.") (sha256 (base32 "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv")) - (patches - (list (search-patch - "python2-pygobject-2-gi-info-type-error-domain.patch"))))) + (patches (search-patches + "python2-pygobject-2-gi-info-type-error-domain.patch")))) (build-system gnu-build-system) (native-inputs `(("which" ,which) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2adf267b09..0fd1d5bb29 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -739,8 +739,8 @@ the API.") version "/gtkglext-" version ".tar.gz")) (sha256 (base32 "1ya4d2j2aacr9ii5zj4ac95fjpdvlm2rg79mgnk7yvl1dcy3y1z5")) - (patches (list - (search-patch "gtkglext-disable-disable-deprecated.patch"))))) + (patches (search-patches + "gtkglext-disable-disable-deprecated.patch")))) (build-system gnu-build-system) (inputs `(("gtk+" ,gtk+-2) ("mesa" ,mesa) @@ -1010,7 +1010,8 @@ featuring mature C, C++ and Python bindings.") "/" name "-" version ".tar.bz2")) (sha256 (base32 "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i")) - (patches (list (search-patch "libbonobo-activation-test-race.patch"))))) + (patches (search-patches + "libbonobo-activation-test-race.patch")))) (build-system gnu-build-system) (arguments ;; The programmer kindly gives us a hook to turn off deprecation warnings ... @@ -1976,7 +1977,7 @@ library.") (base32 "1cchmi08jpjypgmm9i7xzh5qfg2q5k61kry9ns8mhw3z44a440ym")) (patches - (list (search-patch "glib-networking-ssl-cert-file.patch"))))) + (search-patches "glib-networking-ssl-cert-file.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -2371,7 +2372,7 @@ output devices.") (sha256 (base32 "0inlqx0zar498fhi9hh92p2g4kp8qy3zdl4z3vw6bjwp9w6xx454")) - (patches (list (search-patch "geoclue-config.patch"))))) + (patches (search-patches "geoclue-config.patch")))) (build-system glib-or-gtk-build-system) (arguments '(;; The tests want to run the system bus. @@ -2450,7 +2451,7 @@ faster results and to avoid unnecessary server load.") (sha256 (base32 "0f6x9mi1jzgqdpycaikyhjljnw3aacsl3gxndyg0dfqkq6y9jwb9")) - (patches (list (search-patch "upower-builddir.patch"))))) + (patches (search-patches "upower-builddir.patch")))) (build-system glib-or-gtk-build-system) (arguments '( ;; The tests want to contact the system bus, which can't be done in the diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index 58d3bda561..5c0ce4f544 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -47,7 +47,7 @@ (sha256 (base32 "0x84f07p30pwhriamv8ifljgw755cj87rc12jy1xddf47spyj7rp")) - (patches (list (search-patch "gnucash-price-quotes-perl.patch"))))) + (patches (search-patches "gnucash-price-quotes-perl.patch")))) (build-system gnu-build-system) (inputs `(("guile" ,guile-2.0) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 471f383b85..b5a2685f65 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -67,7 +67,7 @@ (sha256 (base32 "0zvv7wd011npcx7yphw9bpgivyxz6mlp87a57n96nv85k96dd2l6")) - (patches (list (search-patch "libextractor-ffmpeg-3.patch"))) + (patches (search-patches "libextractor-ffmpeg-3.patch")) (modules '((guix build utils))) (snippet ;; Nowadays libmagic (from 'file') returns 'audio/ogg' and not diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index c3b859b7a2..5ed6885cab 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -207,9 +207,8 @@ compatible to GNU Pth.") (sha256 (base32 "06mn2viiwsyq991arh5i5fhr9jyxq2bi0jkdj7ndfisxihngpc5p")) - (patches - (list (search-patch - "gnupg-simple-query-ignore-status-messages.patch"))))) + (patches (search-patches + "gnupg-simple-query-ignore-status-messages.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -351,7 +350,7 @@ and every application benefits from this.") ;; Unfortunately, we have to disable some tests due to some gpg-agent ;; goofiness... see: ;; https://bugs.launchpad.net/pygpgme/+bug/999949 - (patches (list (search-patch "pygpgme-disable-problematic-tests.patch"))))) + (patches (search-patches "pygpgme-disable-problematic-tests.patch")))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 1ae97b256b..b2717b8cdb 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -191,7 +191,7 @@ in the Mozilla clients.") (base32 "0knr99yc8sba2ga6x1gwhg9gr1dmgcl344g3bmxm8c364i2vpxns")) ;; Create nss.pc and nss-config. - (patches (list (search-patch "nss-pkgconfig.patch"))))) + (patches (search-patches "nss-pkgconfig.patch")))) (build-system gnu-build-system) (outputs '("out" "bin")) (arguments @@ -288,9 +288,9 @@ standards.") (sha256 (base32 "1wdmd6hasra36g86ha1dw8sl7a5mvr7c4jbjx4zyg9629y5gqr8g")) - (patches (map search-patch - '("icecat-avoid-bundled-includes.patch" - "icecat-re-enable-DHE-cipher-suites.patch"))) + (patches (search-patches + "icecat-avoid-bundled-includes.patch" + "icecat-re-enable-DHE-cipher-suites.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 6edba5025d..b3fd1b6af9 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -176,7 +176,7 @@ many more.") (sha256 (base32 "1izddjwbh1grs8080vmaix72z469qy29wrvkphgmqmcm0sv1by7c")) - (patches (map search-patch '("ilmbase-fix-tests.patch"))))) + (patches (search-patches "ilmbase-fix-tests.patch")))) (build-system gnu-build-system) (home-page "http://www.openexr.com/") (synopsis "Utility C++ libraries for threads, maths, and exceptions") @@ -204,7 +204,7 @@ exception-handling library.") '(substitute* (find-files "." "tmpDir\\.h") (("\"/var/tmp/\"") "\"/tmp/\""))) - (patches (list (search-patch "openexr-missing-samples.patch"))))) + (patches (search-patches "openexr-missing-samples.patch")))) (build-system gnu-build-system) (arguments '(#:phases @@ -245,7 +245,7 @@ storage of the \"EXR\" file format for storing 16-bit floating-point images.") (sha256 (base32 "0mn7cz19mn8dcrhkq15h25gl20ammr1wz0j2j3c2vxs6ph7zn8jy")) - (patches (list (search-patch "openimageio-boost-1.60.patch"))))) + (patches (search-patches "openimageio-boost-1.60.patch")))) (build-system cmake-build-system) ;; FIXME: To run all tests successfully, test image sets from multiple ;; third party sources have to be present. For details see @@ -385,7 +385,7 @@ and understanding different BRDFs (and other component functions).") version ".tar.gz"))) (sha256 (base32 "07wii4i824vy9qsvjsgqxppgqmfdxq0xa87i5yk53fijriadq7mb")) - (patches (list (search-patch "agg-am_c_prototype.patch"))))) + (patches (search-patches "agg-am_c_prototype.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm index 96d284c108..5fc7ee8386 100644 --- a/gnu/packages/grub.scm +++ b/gnu/packages/grub.scm @@ -83,9 +83,9 @@ (sha256 (base32 "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq")) - (patches (list (search-patch "grub-gets-undeclared.patch") - (search-patch "grub-freetype.patch") - (search-patch "grub-CVE-2015-8370.patch"))))) + (patches (search-patches "grub-gets-undeclared.patch" + "grub-freetype.patch" + "grub-CVE-2015-8370.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-werror") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 3bc4b8dc07..255d885b27 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -554,7 +554,7 @@ is part of the GNOME accessibility project.") (sha256 (base32 "0mj6xn40py9r9lvzg633fal81xfwfm89d9mvz7jk4lmwk0g49imj")) - (patches (list (search-patch "gtk2-respect-GUIX_GTK2_PATH.patch"))))) + (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) (propagated-inputs @@ -615,7 +615,7 @@ application suites.") (sha256 (base32 "0lp1hn0qydxx03bianzzr0a4maqzsvylrkzr7c3p0050qihwbgjx")) - (patches (list (search-patch "gtk3-respect-GUIX_GTK3_PATH.patch"))))) + (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch")))) (propagated-inputs `(("at-spi2-atk" ,at-spi2-atk) ("atk" ,atk) @@ -752,7 +752,7 @@ exceptions, macros, and a dynamic programming environment.") (sha256 (base32 "136f236iw3yrrz6pkkp1ma9c5mrs5icqha6pnawinqpk892r3jh7")) - (patches (list (search-patch "guile-rsvg-pkgconfig.patch"))) + (patches (search-patches "guile-rsvg-pkgconfig.patch")) (modules '((guix build utils))) (snippet '(substitute* (find-files "." "Makefile\\.am") @@ -791,7 +791,7 @@ images onto Cairo surfaces.") (sha256 (base32 "1qam447m05sxxv6x8dlzg7qnyfc4dh8apjw1idpfhpns671gfr6m")) - (patches (list (search-patch "guile-present-coding.patch"))) + (patches (search-patches "guile-present-coding.patch")) (modules '((guix build utils))) (snippet '(substitute* "Makefile.in" @@ -977,7 +977,7 @@ extensive documentation, including API reference and a tutorial.") (sha256 (base32 "1gjkf8x6hyx1skq3hhwcbvwifxvrf9qxis5vx8x5igmmgs70g94s")) - (patches (list (search-patch "pycairo-wscript.patch"))))) + (patches (search-patches "pycairo-wscript.patch")))) (build-system waf-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index fe043cba0b..e247634e04 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -72,7 +72,7 @@ (sha256 (base32 "0l200a0v7h8bh0cwz6v7hc13ds39cgqsmfrks55b1rbj5vniyiy3")) - (patches (list (search-patch "guile-1.8-cpp-4.5.patch"))))) + (patches (search-patches "guile-1.8-cpp-4.5.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-error-on-warning") @@ -132,7 +132,7 @@ without requiring the source code to be rewritten.") (sha256 (base32 "1qh3j7308qvsjgwf7h94yqgckpbgz2k3yqdkzsyhqcafvfka9l5f")) - (patches (list (search-patch "guile-arm-fixes.patch"))))) + (patches (search-patches "guile-arm-fixes.patch")))) (build-system gnu-build-system) (native-inputs `(("pkgconfig" ,pkg-config))) (inputs `(("libffi" ,libffi) @@ -410,7 +410,7 @@ library.") (sha256 (base32 "0zparwgf01jgl1x53ik71ghabldq6zz18ha4dscps1i0qrzgap1b")) - (patches (list (search-patch "mcron-install.patch"))))) + (patches (search-patches "mcron-install.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("ed" ,ed) ("which" ,which) ("guile" ,guile-2.0))) diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index a6f5acd4f2..fb33c761de 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -39,9 +39,9 @@ "-src.tgz")) (sha256 (base32 "0ys5f5spizg45qlaa31j2lhgry0jka2gfha527n4ndfxxz5j4sz1")) - (patches (map search-patch '("icu4c-CVE-2014-6585.patch" - "icu4c-CVE-2015-1270.patch" - "icu4c-CVE-2015-4760.patch"))))) + (patches (search-patches "icu4c-CVE-2014-6585.patch" + "icu4c-CVE-2015-1270.patch" + "icu4c-CVE-2015-4760.patch")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) diff --git a/gnu/packages/idutils.scm b/gnu/packages/idutils.scm index 3dc322f568..7a8e1c6752 100644 --- a/gnu/packages/idutils.scm +++ b/gnu/packages/idutils.scm @@ -35,8 +35,7 @@ (sha256 (base32 "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1")) - (patches (list - (search-patch "diffutils-gets-undeclared.patch"))))) + (patches (search-patches "diffutils-gets-undeclared.patch")))) (build-system gnu-build-system) (native-inputs `(("emacs" ,emacs-no-x))) (home-page "http://www.gnu.org/software/idutils/") diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0343e45d6f..aaddce1c70 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -140,10 +140,10 @@ maximum quality factor.") version ".tar.gz")) (sha256 (base32 "136nf1rj9dp5jgv1p7z4dk0xy3wki1w0vfjbk82f645m0w4samsd")) - (patches (map search-patch - '("libtiff-oob-accesses-in-decode.patch" - "libtiff-oob-write-in-nextdecode.patch" - "libtiff-CVE-2015-8665+CVE-2015-8683.patch"))))) + (patches (search-patches + "libtiff-oob-accesses-in-decode.patch" + "libtiff-oob-write-in-nextdecode.patch" + "libtiff-CVE-2015-8665+CVE-2015-8683.patch")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;1.3 MiB of HTML documentation @@ -178,18 +178,18 @@ collection of tools for doing simple manipulations of TIFF images.") (sha256 (base32 "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v")) (patches - (map search-patch '("libwmf-CAN-2004-0941.patch" - "libwmf-CVE-2006-3376.patch" - "libwmf-CVE-2007-0455.patch" - "libwmf-CVE-2007-2756.patch" - "libwmf-CVE-2007-3472.patch" - "libwmf-CVE-2007-3473.patch" - "libwmf-CVE-2007-3477.patch" - "libwmf-CVE-2009-1364.patch" - "libwmf-CVE-2009-3546.patch" - "libwmf-CVE-2015-0848+CVE-2015-4588.patch" - "libwmf-CVE-2015-4695.patch" - "libwmf-CVE-2015-4696.patch"))))) + (search-patches "libwmf-CAN-2004-0941.patch" + "libwmf-CVE-2006-3376.patch" + "libwmf-CVE-2007-0455.patch" + "libwmf-CVE-2007-2756.patch" + "libwmf-CVE-2007-3472.patch" + "libwmf-CVE-2007-3473.patch" + "libwmf-CVE-2007-3477.patch" + "libwmf-CVE-2009-1364.patch" + "libwmf-CVE-2009-3546.patch" + "libwmf-CVE-2015-0848+CVE-2015-4588.patch" + "libwmf-CVE-2015-4695.patch" + "libwmf-CVE-2015-4696.patch")))) (build-system gnu-build-system) (inputs @@ -291,7 +291,7 @@ arithmetic ops.") version ".tar.gz")) (sha256 (base32 "1ffhgmf2fqzk0h4k736pp06z7q5y4x41fg844bd6a9vgncq86bby")) - (patches (list (search-patch "jbig2dec-ignore-testtest.patch"))))) + (patches (search-patches "jbig2dec-ignore-testtest.patch")))) (build-system gnu-build-system) (synopsis "Decoder of the JBIG2 image compression format") @@ -320,8 +320,8 @@ work.") version ".tar.gz")) (sha256 (base32 "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj")) - (patches (map search-patch '("openjpeg-use-after-free-fix.patch" - "openjpeg-CVE-2015-6581.patch"))))) + (patches (search-patches "openjpeg-use-after-free-fix.patch" + "openjpeg-CVE-2015-6581.patch")))) (build-system cmake-build-system) (arguments ;; Trying to run `$ make check' results in a no rule fault. @@ -357,8 +357,8 @@ error-resilience, a Java-viewer for j2k-images, ...") version ".tar.gz")) (sha256 (base32 "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z")) - (patches (map search-patch '("openjpeg-use-after-free-fix.patch" - "openjpeg-CVE-2015-6581.patch"))))))) + (patches (search-patches "openjpeg-use-after-free-fix.patch" + "openjpeg-CVE-2015-6581.patch")))))) (define-public openjpeg-1 (package (inherit openjpeg) @@ -520,7 +520,7 @@ supplies a generic doubly-linked list and some string functions.") (sha256 (base32 "12bz57asdcfsz3zr9i9nska0fb6h3z2aizy412qjqkixkginbz7v")) - (patches (list (search-patch "freeimage-CVE-2015-0852.patch"))))) + (patches (search-patches "freeimage-CVE-2015-0852.patch")))) (build-system gnu-build-system) (arguments '(#:phases (alist-delete @@ -673,7 +673,7 @@ channels.") "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8")) ;; Backported from upstream: ;; https://github.com/DentonW/DevIL/commit/724194d7a9a91221a564579f64bdd6f0abd64219.patch - (patches (list (search-patch "devil-fix-libpng.patch"))) + (patches (search-patches "devil-fix-libpng.patch")) (modules '((guix build utils))) (snippet ;; Fix old lcms include directives and lib flags. @@ -723,21 +723,20 @@ convert, manipulate, filter and display a wide variety of image formats.") (sha256 (base32 "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b")) - (patches - (list - (search-patch "jasper-CVE-2007-2721.patch") - (search-patch "jasper-CVE-2008-3520.patch") - (search-patch "jasper-CVE-2008-3522.patch") - (search-patch "jasper-CVE-2011-4516-and-CVE-2011-4517.patch") - (search-patch "jasper-CVE-2014-8137.patch") - (search-patch "jasper-CVE-2014-8138.patch") - (search-patch "jasper-CVE-2014-8157.patch") - (search-patch "jasper-CVE-2014-8158.patch") - (search-patch "jasper-CVE-2014-9029.patch") - (search-patch "jasper-CVE-2016-1577.patch") - (search-patch "jasper-CVE-2016-1867.patch") - (search-patch "jasper-CVE-2016-2089.patch") - (search-patch "jasper-CVE-2016-2116.patch"))))) + (patches (search-patches + "jasper-CVE-2007-2721.patch" + "jasper-CVE-2008-3520.patch" + "jasper-CVE-2008-3522.patch" + "jasper-CVE-2011-4516-and-CVE-2011-4517.patch" + "jasper-CVE-2014-8137.patch" + "jasper-CVE-2014-8138.patch" + "jasper-CVE-2014-8157.patch" + "jasper-CVE-2014-8158.patch" + "jasper-CVE-2014-9029.patch" + "jasper-CVE-2016-1577.patch" + "jasper-CVE-2016-1867.patch" + "jasper-CVE-2016-2089.patch" + "jasper-CVE-2016-2116.patch")))) (build-system gnu-build-system) (native-inputs `(("unzip" ,unzip))) diff --git a/gnu/packages/imagemagick.scm b/gnu/packages/imagemagick.scm index a68e9aa159..2bdc333d91 100644 --- a/gnu/packages/imagemagick.scm +++ b/gnu/packages/imagemagick.scm @@ -48,7 +48,7 @@ (sha256 (base32 "159afhqrj22jlz745ccbgnkdiwvn8pjcc96jic0iv9ms7gqxwln5")) - (patches (list (search-patch "imagemagick-test-segv.patch"))))) + (patches (search-patches "imagemagick-test-segv.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags '("--with-frozenpaths") diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index a17330ec63..5744c0dcdc 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -142,7 +142,7 @@ SILC and ICB protocols via plugins.") (sha256 (base32 "19apd3hav77v74j7flicai0843k7wrkr2fd3q2ayvzkgnbrrp1ai")) - (patches (list (search-patch "weechat-python.patch"))))) + (patches (search-patches "weechat-python.patch")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) ("pkg-config" ,pkg-config) diff --git a/gnu/packages/ldc.scm b/gnu/packages/ldc.scm index 66da63581c..1709f59f4c 100644 --- a/gnu/packages/ldc.scm +++ b/gnu/packages/ldc.scm @@ -129,7 +129,7 @@ and freshness without requiring additional information from the user.") (sha256 (base32 "0sgdj0536c4nb118yiw1f8lqy5d3g3lpg9l99l165lk9xy45l9z4")) - (patches (list (search-patch "ldc-disable-tests.patch"))))) + (patches (search-patches "ldc-disable-tests.patch")))) ("druntime-src" ,(origin (method url-fetch) diff --git a/gnu/packages/libcanberra.scm b/gnu/packages/libcanberra.scm index bfa7715160..6bac0bcd5b 100644 --- a/gnu/packages/libcanberra.scm +++ b/gnu/packages/libcanberra.scm @@ -64,7 +64,7 @@ ;; his pleasure. (patch-flags '("-p0")) (patches - (list (search-patch "libcanberra-sound-theme-freedesktop.patch"))))) + (search-patches "libcanberra-sound-theme-freedesktop.patch")))) (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) diff --git a/gnu/packages/libevent.scm b/gnu/packages/libevent.scm index 7b3ae6fadd..fab6b5c993 100644 --- a/gnu/packages/libevent.scm +++ b/gnu/packages/libevent.scm @@ -42,7 +42,7 @@ (sha256 (base32 "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki")) - (patches (list (search-patch "libevent-dns-tests.patch"))))) + (patches (search-patches "libevent-dns-tests.patch")))) (build-system gnu-build-system) (inputs `(;; Dependencies used for the tests and for `event_rpcgen.py'. diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 9d58a267b6..5256c49035 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -250,7 +250,7 @@ working with graphics in the WPG (WordPerfect Graphics) format.") version ".tar.gz")) (sha256 (base32 "1dprvk4fibylv24l7gr49gfqbkfgmxynvgssvdcycgpf7n8h4zm8")) - (patches (list (search-patch "libcmis-fix-test-onedrive.patch"))))) + (patches (search-patches "libcmis-fix-test-onedrive.patch")))) (build-system gnu-build-system) (native-inputs `(("cppunit" ,cppunit) diff --git a/gnu/packages/libunwind.scm b/gnu/packages/libunwind.scm index ab3496277a..cda83b2bc0 100644 --- a/gnu/packages/libunwind.scm +++ b/gnu/packages/libunwind.scm @@ -35,7 +35,7 @@ (sha256 (base32 "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx")) - (patches (list (search-patch "libunwind-CVE-2015-3239.patch"))))) + (patches (search-patches "libunwind-CVE-2015-3239.patch")))) (build-system gnu-build-system) (arguments ;; FIXME: As of glibc 2.17, we get 3 out of 34 test failures. diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index c3427e7f6f..61136791d3 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -98,7 +98,7 @@ version of libusb to run with newer libusb.") (sha256 (base32 "12dinqic0ljnhrwx3rc61jc7q24ybr0mckc2ya5kh1s1np0d7w93")) - (patches (list (search-patch "libmtp-devices.patch"))))) + (patches (search-patches "libmtp-devices.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 31554c01df..8659471623 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -170,8 +170,7 @@ (sha256 (base32 "0jxnz9ahfic79rp93l5wxcbgh4pkv85mwnjlbv1gz3jawv5cvwp1")) - (patches - (list (search-patch "module-init-tools-moduledir.patch"))))) + (patches (search-patches "module-init-tools-moduledir.patch")))) (build-system gnu-build-system) (arguments ;; FIXME: The upstream tarball lacks man pages, and building them would @@ -453,7 +452,7 @@ providing the system administrator with some help in common tasks.") (sha256 (base32 "1ivdx1bhjbakf77agm9dn3wyxia1wgz9lzxgd61zqxw3xzih9gzw")) - (patches (list (search-patch "util-linux-tests.patch"))) + (patches (search-patches "util-linux-tests.patch")) (modules '((guix build utils))) (snippet ;; We take the 'logger' program from GNU Inetutils and 'kill' @@ -820,7 +819,7 @@ intercept and print the system calls executed by the program.") (sha256 (base32 "0fx057746dj7rjdi0jnvx2m9b0y1lgdkh1hks87d8w32xyihf3k9")) - (patches (list (search-patch "alsa-lib-mips-atomic-fix.patch"))))) + (patches (search-patches "alsa-lib-mips-atomic-fix.patch")))) (build-system gnu-build-system) (home-page "http://www.alsa-project.org/") (synopsis "The Advanced Linux Sound Architecture libraries") @@ -981,8 +980,7 @@ manpages.") (sha256 (base32 "0yvxrzk0mzmspr7sa34hm1anw6sif39gyn85w4c5ywfn8inxvr3s")) - (patches - (list (search-patch "net-tools-bitrot.patch"))))) + (patches (search-patches "net-tools-bitrot.patch")))) (build-system gnu-build-system) (arguments '(#:modules ((guix build gnu-build-system) @@ -1564,7 +1562,7 @@ to use Linux' inotify mechanism, which allows file accesses to be monitored.") (sha256 (base32 "1yid3a9b64a60ybj66fk2ysrq5klnl0ijl4g624cl16y8404g9rv")) - (patches (list (search-patch "kmod-module-directory.patch"))))) + (patches (search-patches "kmod-module-directory.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -1609,7 +1607,7 @@ from the module-init-tools project.") (sha256 (base32 "0akg9gcc3c2p56xbhlvbybqavcprly5q0bvk655zwl6d62j8an7p")) - (patches (list (search-patch "eudev-rules-directory.patch"))))) + (patches (search-patches "eudev-rules-directory.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -1743,7 +1741,7 @@ interface.") (sha256 (base32 "1gydiqgb08d9gbx4l6gv98zg3pljc984m50hmn3ysxcbkxkvkz23")) - (patches (list (search-patch "crda-optional-gcrypt.patch"))))) + (patches (search-patches "crda-optional-gcrypt.patch")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -1861,7 +1859,7 @@ country-specific regulations for the wireless spectrum.") (sha256 (base32 "1ksgrynxgrq590nb2fwxrl1gwzisjkqlyg3ljfd1al0ibrk6mbjx")) - (patches (list (search-patch "lm-sensors-hwmon-attrs.patch"))))) + (patches (search-patches "lm-sensors-hwmon-attrs.patch")))) (build-system gnu-build-system) (inputs `(("rrdtool" ,rrdtool) ("perl" ,perl) @@ -2201,7 +2199,7 @@ also contains the libsysfs library.") version ".tar.gz")) (sha256 (base32 "0qfqv7nqmjfr3p0bwrdlxkiqwqr7vmx053cadaa548ybqbghxmvm")) - (patches (list (search-patch "cpufrequtils-fix-aclocal.patch"))))) + (patches (search-patches "cpufrequtils-fix-aclocal.patch")))) (build-system gnu-build-system) (native-inputs `(("sysfsutils" ,sysfsutils-1))) @@ -2298,7 +2296,7 @@ MPEG-2 and audio over Linux IEEE 1394.") (sha256 (base32 "132vdvh3myjgcjn6i9w90ck16ddjxjcszklzkyvr4f5ifqd7wfhg")) - (patches (list (search-patch "mdadm-gcc-4.9-fix.patch"))))) + (patches (search-patches "mdadm-gcc-4.9-fix.patch")))) (build-system gnu-build-system) (inputs `(("udev" ,eudev))) diff --git a/gnu/packages/lirc.scm b/gnu/packages/lirc.scm index f8828d3f03..b077825529 100644 --- a/gnu/packages/lirc.scm +++ b/gnu/packages/lirc.scm @@ -39,7 +39,7 @@ (sha256 (base32 "19c6ldjsdnk1md66q3nb035ja1xj217k8iabhxpsb8rs10a6kwi6")) - (patches (list (search-patch "lirc-localstatedir.patch"))))) + (patches (search-patches "lirc-localstatedir.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--localstatedir=/var"))) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index d5e5ed65ad..3bf019fa83 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -102,7 +102,7 @@ compiler. In LLVM this library is called \"compiler-rt\".") (uri (string-append "http://llvm.org/releases/" version "/cfe-" version ".src.tar.xz")) (sha256 (base32 hash)) - (patches (list (search-patch "clang-libc-search-path.patch"))))) + (patches (search-patches "clang-libc-search-path.patch")))) ;; Using cmake allows us to treat llvm as an external library. There ;; doesn't seem to be any way to do this with clang's autotools-based ;; build system. diff --git a/gnu/packages/lsh.scm b/gnu/packages/lsh.scm index 3b6487f38c..bb941365a9 100644 --- a/gnu/packages/lsh.scm +++ b/gnu/packages/lsh.scm @@ -44,7 +44,7 @@ (sha256 (base32 "0z6rlalhvfca64jpvksppc9bdhs7jwhiw4y35g5ibvh91xp3rn1l")) - (patches (list (search-patch "liboop-mips64-deplibs-fix.patch"))))) + (patches (search-patches "liboop-mips64-deplibs-fix.patch")))) (build-system gnu-build-system) (home-page "http://www.lysator.liu.se/liboop/") (synopsis "Event loop library") diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index fcb41831eb..17874f86ab 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -37,8 +37,8 @@ version ".tar.gz")) (sha256 (base32 "0b8034v1s82n4dg5rzcn12067ha3nxaylp2vdp8gg08kjsbzphhk")) - (patches (list (search-patch "lua-pkgconfig.patch") - (search-patch "lua52-liblua-so.patch"))))) + (patches (search-patches "lua-pkgconfig.patch" + "lua52-liblua-so.patch")))) (build-system gnu-build-system) (inputs `(("readline" ,readline))) (arguments @@ -78,7 +78,7 @@ for configuration, scripting, and rapid prototyping.") version ".tar.gz")) (sha256 (base32 "0cskd4w0g6rdm2q8q3i4n1h3j8kylhs3rq8mxwl9vwlmlxbgqh16")) - (patches (list (search-patch "lua51-liblua-so.patch"))))))) + (patches (search-patches "lua51-liblua-so.patch")))))) (define-public luajit (package @@ -90,8 +90,8 @@ for configuration, scripting, and rapid prototyping.") version ".tar.gz")) (sha256 (base32 "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm")) - (patches (list (search-patch "luajit-symlinks.patch") - (search-patch "luajit-no_ldconfig.patch"))))) + (patches (search-patches "luajit-symlinks.patch" + "luajit-no_ldconfig.patch")))) (build-system gnu-build-system) (arguments '(#:tests? #f ;luajit is distributed without tests diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index 677b580bed..38a7aea137 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -69,7 +69,7 @@ in Qt.") (sha256 (base32 "0ljdzqavvy82qwwwnhg2bgbshl2ns0k2lcswxlx1cfc8rcdr9w5l")) - (patches (map search-patch '("liblxqt-include.patch"))))) + (patches (search-patches "liblxqt-include.patch")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index e5eefc7c4c..fd379b7968 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -92,7 +92,7 @@ (sha256 (base32 "0szbqa12zqzldqyw97lxqax3ja2adis83i7brdfsxmrfw68iaf65")) - (patches (list (search-patch "m4-gets-undeclared.patch"))))) + (patches (search-patches "m4-gets-undeclared.patch")))) (build-system gnu-build-system) (arguments '(;; TODO: Add `--with-sql'. @@ -185,7 +185,7 @@ aliasing facilities to work just as they would on normal mail.") (sha256 (base32 "06bc2drbgalkk68rzg7hq2v5m5qgjxff5357wg0419dpi8ivdbr9")) - (patches (list (search-patch "mutt-store-references.patch"))))) + (patches (search-patches "mutt-store-references.patch")))) (build-system gnu-build-system) (inputs `(("cyrus-sasl" ,cyrus-sasl) @@ -1129,9 +1129,7 @@ deliver it in various ways.") ;; The following patch fixes an ambiguous definition of ;; getline() in formail.c. The patch is provided by Debian as ;; patch 24. - (patches - (list - (search-patch "procmail-ambiguous-getline-debian.patch"))))) + (patches (search-patches "procmail-ambiguous-getline-debian.patch")))) (arguments `(#:phases (modify-phases %standard-phases (replace 'configure diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a673a55eaa..d009905346 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -777,7 +777,7 @@ arising after the discretization of partial differential equations.") (sha256 (base32 "1820jfp3mbl7n85765v5mp6p0gzqpgr4d2lrnhwj4gl7cwp5ndah")) - (patches (list (search-patch "mumps-build-parallelism.patch"))))) + (patches (search-patches "mumps-build-parallelism.patch")))) (build-system gnu-build-system) (inputs `(("fortran" ,gfortran) @@ -1044,7 +1044,7 @@ also provides threshold-based ILU factorization preconditioners.") "superlu_dist_" version ".tar.gz")) (sha256 (base32 "1hnak09yxxp026blq8zhrl7685yip16svwngh1wysqxf8z48vzfj")) - (patches (list (search-patch "superlu-dist-scotchmetis.patch"))))) + (patches (search-patches "superlu-dist-scotchmetis.patch")))) (build-system gnu-build-system) (native-inputs `(("tcsh" ,tcsh))) @@ -1145,8 +1145,8 @@ implemented in ANSI C, and MPI for communications.") "scotch_" version ".tar.gz")) (sha256 (base32 "1ir088mvrqggyqdkx9qfynmiaffqbyih5qfl5mga2nrlm1qlsgzm")) - (patches (list (search-patch "scotch-test-threading.patch") - (search-patch "pt-scotch-build-parallelism.patch"))))) + (patches (search-patches "scotch-test-threading.patch" + "pt-scotch-build-parallelism.patch")))) (build-system gnu-build-system) (inputs `(("zlib" ,zlib) @@ -1371,7 +1371,7 @@ to BMP, JPEG or PNG image formats.") (sha256 (base32 "0x1rk659sn3cq0n5c90848ilzr1gb1wf0072fl6jhkdq00qgh2s0")) - (patches (list (search-patch "maxima-defsystem-mkdir.patch"))))) + (patches (search-patches "maxima-defsystem-mkdir.patch")))) (build-system gnu-build-system) (inputs `(("gcl" ,gcl) @@ -1960,7 +1960,7 @@ revised simplex and the branch-and-bound methods.") (sha256 (base32 "185jych0gdnpkjwxni7pd0dda149492zwq2457xdjg76bzj78mnp")) - (patches (list (search-patch "dealii-p4est-interface.patch"))) + (patches (search-patches "dealii-p4est-interface.patch")) (modules '((guix build utils))) (snippet ;; Remove bundled sources: UMFPACK, TBB, muParser, and boost diff --git a/gnu/packages/mcrypt.scm b/gnu/packages/mcrypt.scm index 71cbfd1ff9..a683ad7ac9 100644 --- a/gnu/packages/mcrypt.scm +++ b/gnu/packages/mcrypt.scm @@ -90,7 +90,7 @@ XTEA, 3WAY, TWOFISH, BLOWFISH, ARCFOUR, WAKE and more.") (sha256 (base32 "1w7yiljan8gf1ibiypi6hm3r363imm3sxl1j8hapjdq3m591qljn")) - (patches (list (search-patch "mhash-keygen-test-segfault.patch"))))) + (patches (search-patches "mhash-keygen-test-segfault.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) ;for tests diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 1646d70b0e..fbe84f58b2 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -71,8 +71,7 @@ (sha256 (base32 "1x8rliydhbibmzwdbyr7pd7n87m2jmxnqkpvaalnf4154hj1hfwb")) - (patches - (list (search-patch "libotr-test-auth-fix.patch"))))) + (patches (search-patches "libotr-test-auth-fix.patch")))) (build-system gnu-build-system) (propagated-inputs `(("libgcrypt" ,libgcrypt))) ; libotr headers include gcrypt.h @@ -180,8 +179,8 @@ dictionaries. HexChat can be extended with multiple addons.") (sha256 (base32 "17k3g9qd9d010czk5846qxvzkmw4fihv8l6m2a2287crbxm3xhd4")) - (patches (list (search-patch "ngircd-no-dns-in-tests.patch") - (search-patch "ngircd-handle-zombies.patch"))))) + (patches (search-patches "ngircd-no-dns-in-tests.patch" + "ngircd-handle-zombies.patch")))) (build-system gnu-build-system) ;; Needed for the test suite. (native-inputs `(("procps" ,procps) @@ -246,7 +245,7 @@ supports IPv6, SSL-protected connections as well as PAM for authentication.") (sha256 (base32 "01s0q30qrjlzj7kkz6f8lvrwsdd55a9yjh2xjjwyyxzw849j3bpj")) - (patches (list (search-patch "pidgin-add-search-path.patch"))))) + (patches (search-patches "pidgin-add-search-path.patch")))) (build-system glib-or-gtk-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/mit-krb5.scm b/gnu/packages/mit-krb5.scm index 5f9868979a..565163732e 100644 --- a/gnu/packages/mit-krb5.scm +++ b/gnu/packages/mit-krb5.scm @@ -40,10 +40,10 @@ (base32 "1gpscn78lv48dxccxq9ncyj53w9l2a15xmngjfa1wylvmn7g0jjx")) (patches - (map search-patch '("mit-krb5-init-context-null-spnego.patch" - "mit-krb5-CVE-2015-8629.patch" - "mit-krb5-CVE-2015-8630.patch" - "mit-krb5-CVE-2015-8631.patch"))))) + (search-patches "mit-krb5-init-context-null-spnego.patch" + "mit-krb5-CVE-2015-8629.patch" + "mit-krb5-CVE-2015-8630.patch" + "mit-krb5-CVE-2015-8631.patch")))) (build-system gnu-build-system) (native-inputs `(("bison" ,bison) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 5dec2a8b3f..fe1d13b382 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -55,10 +55,10 @@ (sha256 (base32 "14460zhacxhswnzb36qfpd1f2wbk10qvksvm6wyq5hpvdgnw7ymv")) - (patches (map search-patch '("libmad-armv7-thumb-pt1.patch" - "libmad-armv7-thumb-pt2.patch" - "libmad-frame-length.patch" - "libmad-mips-newgcc.patch"))))) + (patches (search-patches "libmad-armv7-thumb-pt1.patch" + "libmad-armv7-thumb-pt2.patch" + "libmad-frame-length.patch" + "libmad-mips-newgcc.patch")))) (build-system gnu-build-system) (arguments `(#:phases @@ -367,8 +367,7 @@ use with CD-recording software).") (sha256 (base32 "1ss3c1a5hx6c99q1cryxg0jhbnbdj6ga9xyz0dzlz9qhzg5qswfs")) - (patches - (list (search-patch "ripperx-missing-file.patch"))))) + (patches (search-patches "ripperx-missing-file.patch")))) (build-system gnu-build-system) (propagated-inputs `(("gs-fonts" ,gs-fonts) @@ -423,7 +422,7 @@ format.") (sha256 (base32 "0sf4pns0245009z6mbxpx7kqy4kwl69bc95wz9v23wgappsvxgy1")) - (patches (list (search-patch "mpc123-initialize-ao.patch"))))) + (patches (search-patches "mpc123-initialize-ao.patch")))) (build-system gnu-build-system) (arguments '(#:phases (alist-replace diff --git a/gnu/packages/multiprecision.scm b/gnu/packages/multiprecision.scm index d97bf9ba28..99243235ad 100644 --- a/gnu/packages/multiprecision.scm +++ b/gnu/packages/multiprecision.scm @@ -40,8 +40,7 @@ (sha256 (base32 "12b9s4jn48gbar6dbs5qrlmljdmnq43xy3ji9yjzic0mwp6dmnk8")) - (patches (map search-patch - '("gmp-faulty-test.patch"))))) + (patches (search-patches "gmp-faulty-test.patch")))) (build-system gnu-build-system) (native-inputs `(("m4" ,m4))) (outputs '("out" "debug")) @@ -75,9 +74,8 @@ cryptography and computational algebra.") (sha256 (base32 "0r5pp27cy7ch3dg5v0rsny8bib1zfvrza6027g2mp5f6v8pd6mli")) - (patches (map search-patch - '("gmp-arm-asm-nothumb.patch" - "gmp-faulty-test.patch"))))))) + (patches (search-patches "gmp-arm-asm-nothumb.patch" + "gmp-faulty-test.patch")))))) (define-public mpfr (package diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1fa142120e..f733e45cf7 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1055,7 +1055,7 @@ improves on support for JACK features, such as JACK MIDI.") version ".tar.gz")) (sha256 (base32 "1dhphsya41rv8z6yqcv9l6fwbslsds4zh1y56zizi39nd996d40v")) - (patches (list (search-patch "cursynth-wave-rand.patch"))))) + (patches (search-patches "cursynth-wave-rand.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) ;; TODO: See https://github.com/iyoko/cursynth/issues/4 which currently diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm index ea5488afc9..cfcc6d5a51 100644 --- a/gnu/packages/ninja.scm +++ b/gnu/packages/ninja.scm @@ -37,8 +37,8 @@ (sha256 (base32 "1h3yfwcfl61v493vna6jia2fizh8rpig7qw2504cvkr6gid3p5bw")) - (patches (map search-patch - '("ninja-zero-mtime.patch" "ninja-tests.patch"))))) + (patches (search-patches "ninja-zero-mtime.patch" + "ninja-tests.patch")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) (arguments diff --git a/gnu/packages/nvi.scm b/gnu/packages/nvi.scm index 128715f6ac..999b553733 100644 --- a/gnu/packages/nvi.scm +++ b/gnu/packages/nvi.scm @@ -37,9 +37,9 @@ ".tar.bz2")) (sha256 (base32 "0nbbs1inyrqds0ywn3ln5slv54v5zraq7lszkg8nsavv4kivhh9l")) - (patches (list (search-patch "nvi-assume-preserve-path.patch") - (search-patch "nvi-dbpagesize-binpower.patch") - (search-patch "nvi-db4.patch"))) + (patches (search-patches "nvi-assume-preserve-path.patch" + "nvi-dbpagesize-binpower.patch" + "nvi-db4.patch")) (snippet ;; Create a wrapper for the configure script, make it executable. '(let ((conf-wrap (open-output-file "configure"))) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 4b5ac617d5..5d489532f7 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -633,8 +633,7 @@ to the other.") (sha256 (base32 "02abg1lsnwvjg3igdyb8qjgr5kv1nbwl4gaf8mdinzfii5p82721")) - (patches - (list (search-patch "ocaml-findlib-make-install.patch"))))) + (patches (search-patches "ocaml-findlib-make-install.patch")))) (build-system gnu-build-system) (native-inputs `(("camlp4" ,camlp4) diff --git a/gnu/packages/orpheus.scm b/gnu/packages/orpheus.scm index 7d4b1cac63..069d3e548a 100644 --- a/gnu/packages/orpheus.scm +++ b/gnu/packages/orpheus.scm @@ -40,7 +40,7 @@ (sha256 (base32 "1xbgxq8fybwhm51nw9hvvrgi873qzkc2qvmy15d2m2hw2yqa99hq")) - (patches (list (search-patch "orpheus-cast-errors-and-includes.patch"))))) + (patches (search-patches "orpheus-cast-errors-and-includes.patch")))) (build-system gnu-build-system) (inputs `(("ncurses" ,ncurses) diff --git a/gnu/packages/ots.scm b/gnu/packages/ots.scm index 1c0d4a71f4..f1900746b6 100644 --- a/gnu/packages/ots.scm +++ b/gnu/packages/ots.scm @@ -40,8 +40,7 @@ ".tar.gz")) (sha256 (base32 "0dz1ccd7ymzk4swz1aly4im0k3pascnshmgg1whd2rk14li8v47a")) - (patches - (list (search-patch "ots-no-include-missing-file.patch"))))) + (patches (search-patches "ots-no-include-missing-file.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 4648010bf1..828bd26cf8 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -74,8 +74,8 @@ and they are executed on lists of files, hosts, users or other items.") (sha256 (base32 "1rmi35l4img00dr4vic8cv8s7b6n1yx1mkq2s7kjf5hvqdh6s2ki")) - (patches (list - (search-patch "slurm-configure-remove-nonfree-contribs.patch"))) + (patches (search-patches + "slurm-configure-remove-nonfree-contribs.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 31a735fd5d..c4232cc8a7 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -48,8 +48,7 @@ (sha256 (base32 "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i")) - (patches - (list (search-patch "patchutils-xfail-gendiff-tests.patch"))))) + (patches (search-patches "patchutils-xfail-gendiff-tests.patch")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) (arguments diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 9215b38d91..24ecf905e0 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -72,7 +72,7 @@ POSIX regular expression API.") (inherit pcre) (source (origin (inherit (package-source pcre)) - (patches (list (search-patch "pcre-CVE-2016-3191.patch"))))))) + (patches (search-patches "pcre-CVE-2016-3191.patch")))))) (define-public pcre2 (package diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index e8e6993a9c..1d33be85d5 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -336,9 +336,8 @@ by using the poppler rendering engine.") (sha256 (base32 "1rywx09qn6ap5hb1z31wxby4lzdrqdbldm51pjk1ifflr37xwirk")) - (patches - (list - (search-patch "zathura-plugindir-environment-variable.patch"))))) + (patches (search-patches + "zathura-plugindir-environment-variable.patch")))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gnu-gettext))) (inputs `(("girara" ,girara) diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index 9bbcc8ffa4..a517581e7d 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -47,14 +47,14 @@ (sha256 (base32 "09wg24w5syyafyv87l6z8pxwz4bjgcdj996bx5844k6m9445sirb")) - (patches (map search-patch - '("perl-no-sys-dirs.patch" - "perl-autosplit-default-time.patch" - "perl-source-date-epoch.patch" - "perl-deterministic-ordering.patch" - "perl-no-build-time.patch" - "perl-CVE-2015-8607.patch" - "perl-CVE-2016-2381.patch"))))) + (patches (search-patches + "perl-no-sys-dirs.patch" + "perl-autosplit-default-time.patch" + "perl-source-date-epoch.patch" + "perl-deterministic-ordering.patch" + "perl-no-build-time.patch" + "perl-CVE-2015-8607.patch" + "perl-CVE-2016-2381.patch")))) (build-system gnu-build-system) (arguments '(#:tests? #f @@ -3109,7 +3109,7 @@ installation version 5.005 or newer.") (sha256 (base32 "1px6qmszmfc69v36vd8d92av4nkrif6xf4nrj3xv647xwi2svwmk")) - (patches (list (search-patch "perl-module-pluggable-search.patch"))))) + (patches (search-patches "perl-module-pluggable-search.patch")))) (build-system perl-build-system) (home-page "http://search.cpan.org/dist/Module-Pluggable") (synopsis "Give your Perl module the ability to have plugins") diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index e9a247142d..67f692daf5 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -51,7 +51,7 @@ (sha256 (base32 "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg")) - (patches (list (search-patch "plotutils-libpng-jmpbuf.patch"))) + (patches (search-patches "plotutils-libpng-jmpbuf.patch")) (modules '((guix build utils))) (snippet ;; Force the use of libXaw7 instead of libXaw. When not doing @@ -179,7 +179,7 @@ colors, styles, options and details.") (sha256 (base32 "11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z")) - (patches (list (search-patch "asymptote-gsl2.patch"))))) + (patches (search-patches "asymptote-gsl2.patch")))) (build-system gnu-build-system) ;; Note: The 'asy' binary retains a reference to docdir for use with its ;; "help" command in interactive mode, so adding a "doc" output is not diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 4f21612804..08b753a6cf 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -48,7 +48,7 @@ (sha256 (base32 "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71")) - (patches (list (search-patch "polkit-drop-test.patch"))) + (patches (search-patches "polkit-drop-test.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/pulseaudio.scm b/gnu/packages/pulseaudio.scm index 8c37b2a3f1..b2b0508e58 100644 --- a/gnu/packages/pulseaudio.scm +++ b/gnu/packages/pulseaudio.scm @@ -131,9 +131,9 @@ rates.") '(substitute* "src/daemon/default.pa.in" (("load-module module-console-kit" all) (string-append "#" all "\n")))) - (patches - (list (search-patch "pulseaudio-fix-mult-test.patch") - (search-patch "pulseaudio-longer-test-timeout.patch"))))) + (patches (search-patches + "pulseaudio-fix-mult-test.patch" + "pulseaudio-longer-test-timeout.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--localstatedir=/var" ;"--sysconfdir=/etc" diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index bc0a54b971..4238965fd0 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -100,10 +100,10 @@ (sha256 (base32 "1h7zbrf9pkj29hlm18b10548ch9757f75m64l47sy75rh43p7lqw")) - (patches (map search-patch - '("python-2.7-search-paths.patch" - "python-2-deterministic-build-info.patch" - "python-2.7-source-date-epoch.patch"))))) + (patches (search-patches + "python-2.7-search-paths.patch" + "python-2-deterministic-build-info.patch" + "python-2.7-source-date-epoch.patch")))) (outputs '("out" "tk")) ;tkinter; adds 50 MiB to the closure (build-system gnu-build-system) @@ -267,12 +267,12 @@ data types.") (method url-fetch) (uri (string-append "https://www.python.org/ftp/python/" version "/Python-" version ".tar.xz")) - (patches (map search-patch - '("python-fix-tests.patch" - ;; XXX Try removing this patch for python > 3.4.3 - "python-disable-ssl-test.patch" - "python-3-deterministic-build-info.patch" - "python-3-search-paths.patch"))) + (patches (search-patches + "python-fix-tests.patch" + ;; XXX Try removing this patch for python > 3.4.3 + "python-disable-ssl-test.patch" + "python-3-deterministic-build-info.patch" + "python-3-search-paths.patch")) (patch-flags '("-p0")) (sha256 (base32 @@ -1255,9 +1255,8 @@ commands.") (sha256 (base32 "17ni00p08gp5lkxlrrcnvi3x09fmajnlbz4da03qcgl9q21ym4jd")) - (patches (map search-patch - (list "pybugz-stty.patch" - "pybugz-encode-error.patch"))))) + (patches (search-patches "pybugz-stty.patch" + "pybugz-encode-error.patch")))) (build-system python-build-system) (arguments `(#:python ,python-2 ; SyntaxError with Python 3 @@ -3298,7 +3297,7 @@ transcendental functions).") (sha256 (base32 "1dn05cvd0g984lzhh72wa0z93psgwshbbg93fkab6slx5m3l95av")) - (patches (list (search-patch "matplotlib-setupext-tk.patch"))))) + (patches (search-patches "matplotlib-setupext-tk.patch")))) (build-system python-build-system) (outputs '("out" "doc")) (propagated-inputs ; the following packages are all needed at run time @@ -4272,7 +4271,7 @@ without using the configuration machinery.") (source (origin (method url-fetch) - (patches (list (search-patch "python-ipython-inputhook-ctype.patch"))) + (patches (search-patches "python-ipython-inputhook-ctype.patch")) (uri (string-append "https://pypi.python.org/packages/source/i/" "ipython/ipython-" version ".tar.gz")) (sha256 @@ -6642,7 +6641,7 @@ addon modules.") "00h9rcmws03xvdlfni11yb60bz3kxfvsj6dg6nrpzj71f03nbxd2")) ;; Patch setup.py so it looks for python-setuptools, which is ;; required to parse the keyword 'install_requires' in setup.py. - (patches (list (search-patch "python-configobj-setuptools.patch"))))) + (patches (search-patches "python-configobj-setuptools.patch")))) (build-system python-build-system) (native-inputs `(("python-setuptools" ,python-setuptools) @@ -7767,10 +7766,8 @@ file.") (sha256 (base32 "16dsv9qi0r4qsrsb6dilpq2rx0fnglvh36flzywcdnm2jg43mb5d")) - (patches (list (search-patch - "python-paste-remove-website-test.patch") - (search-patch - "python-paste-remove-timing-test.patch"))))) + (patches (search-patches "python-paste-remove-website-test.patch" + "python-paste-remove-timing-test.patch")))) (build-system python-build-system) (native-inputs `(("python-nose" ,python-nose))) @@ -8502,7 +8499,7 @@ module, adding support for Unicode strings.") (base32 "0d8n1dlpiz7av8dmbp0vclrwl9cnxizr4f2c9xvj1h5nvn480527")) ;; https://github.com/markokr/rarfile/pull/17/ - (patches (list (search-patch "python-rarfile-fix-tests.patch"))))) + (patches (search-patches "python-rarfile-fix-tests.patch")))) (build-system python-build-system) (arguments '(#:phases diff --git a/gnu/packages/qemu.scm b/gnu/packages/qemu.scm index 1104a2da6a..c0ee504b24 100644 --- a/gnu/packages/qemu.scm +++ b/gnu/packages/qemu.scm @@ -62,20 +62,19 @@ (sha256 (base32 "1m3j6xl7msrniidkvr5pw9d44yba5m7hm42xz8xy77v105s8hhrl")) - (patches - (map search-patch - '("qemu-virtio-9p-use-accessor-to-get-thread-pool.patch" - "qemu-CVE-2015-8558.patch" - "qemu-CVE-2015-8567.patch" - "qemu-CVE-2016-1922.patch" - "qemu-CVE-2015-8613.patch" - "qemu-CVE-2015-8701.patch" - "qemu-CVE-2015-8743.patch" - "qemu-CVE-2016-1568.patch" - "qemu-CVE-2015-8619.patch" - "qemu-CVE-2016-1981.patch" - "qemu-usb-ehci-oob-read.patch" - "qemu-CVE-2016-2197.patch"))))) + (patches (search-patches + "qemu-virtio-9p-use-accessor-to-get-thread-pool.patch" + "qemu-CVE-2015-8558.patch" + "qemu-CVE-2015-8567.patch" + "qemu-CVE-2016-1922.patch" + "qemu-CVE-2015-8613.patch" + "qemu-CVE-2015-8701.patch" + "qemu-CVE-2015-8743.patch" + "qemu-CVE-2016-1568.patch" + "qemu-CVE-2015-8619.patch" + "qemu-CVE-2016-1981.patch" + "qemu-usb-ehci-oob-read.patch" + "qemu-CVE-2016-2197.patch")))) (build-system gnu-build-system) (arguments '(#:phases (alist-replace diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index bfd99b6519..7b2be4f4e9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -252,8 +252,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (sha256 (base32 "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272")) - (patches (map search-patch - '("qt4-ldflags.patch"))) + (patches (search-patches "qt4-ldflags.patch")) (modules '((guix build utils))) (snippet ;; Remove webkit module, which is not built. @@ -440,7 +439,7 @@ module provides support functions to the automatically generated code.") (sha256 (base32 "056qmkv02wdcfblqdaxiswrgn4wa88sz22i1x58dpb1iniavplfd")) - (patches (list (search-patch "pyqt-configure.patch"))))) + (patches (search-patches "pyqt-configure.patch")))) (build-system gnu-build-system) (native-inputs `(("python-sip" ,python-sip) diff --git a/gnu/packages/ratpoison.scm b/gnu/packages/ratpoison.scm index dc6db7258f..23adf859a7 100644 --- a/gnu/packages/ratpoison.scm +++ b/gnu/packages/ratpoison.scm @@ -51,7 +51,7 @@ (sha256 (base32 "1w502z55vv7zs45l80nsllqh9fvfwjfdfi11xy1qikhzdmirains")) - (patches (list (search-patch "ratpoison-shell.patch"))))) + (patches (search-patches "ratpoison-shell.patch")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index b577e266f9..958716a447 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -89,9 +89,8 @@ HTML and JSON.") (sha256 (base32 "1arffdwivig88kkx685pldr784njm0249k0rb1f1plwavlrw9zfx")) - (patches (list - (search-patch "clucene-pkgconfig.patch") - (search-patch "clucene-contribs-lib.patch"))))) + (patches (search-patches "clucene-pkgconfig.patch" + "clucene-contribs-lib.patch")))) (build-system cmake-build-system) (inputs `(("boost" ,boost) ; could also use bundled copy @@ -311,7 +310,7 @@ ideal (e.g. in LV2 implementations or embedded applications).") ".tar.gz")) (patches ;; The patch has no effect under Python 3. - (list (search-patch "python2-rdflib-drop-sparqlwrapper.patch"))) + (search-patches "python2-rdflib-drop-sparqlwrapper.patch")) (sha256 (base32 "0kvaf332cqbi47rqzlpdx4mbkvw12mkrzkj8n9l19wk713d4py9w")))) diff --git a/gnu/packages/readline.scm b/gnu/packages/readline.scm index 13ce9165f4..db469db051 100644 --- a/gnu/packages/readline.scm +++ b/gnu/packages/readline.scm @@ -46,7 +46,7 @@ (sha256 (base32 "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn")) - (patches (list (search-patch "readline-link-ncurses.patch"))) + (patches (search-patches "readline-link-ncurses.patch")) (patch-flags '("-p0")))) (build-system gnu-build-system) (propagated-inputs `(("ncurses" ,ncurses))) diff --git a/gnu/packages/rush.scm b/gnu/packages/rush.scm index 0a65599e24..6926f68787 100644 --- a/gnu/packages/rush.scm +++ b/gnu/packages/rush.scm @@ -36,7 +36,7 @@ (sha256 (base32 "0fh0gbbp0iiq3wbkf503xb40r8ljk42vyj9bnlflbz82d6ipy1rm")) - (patches (list (search-patch "cpio-gets-undeclared.patch"))))) + (patches (search-patches "cpio-gets-undeclared.patch")))) (build-system gnu-build-system) (home-page "http://www.gnu.org/software/rush/") (synopsis "Restricted user (login) shell") diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 50533b9a29..f9537d72b2 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -187,7 +187,7 @@ features an integrated Emacs-like editor and a large runtime library.") (sha256 (base32 "170q7nh08n4v20xl81fxb0xcdxphqqacfa643hsa8i2ar6pki04c")) - (patches (list (search-patch "bigloo-gc-shebangs.patch"))))) + (patches (search-patches "bigloo-gc-shebangs.patch")))) (build-system gnu-build-system) (arguments `(#:test-target "test" @@ -277,8 +277,8 @@ Scheme and C programs and between Scheme and Java programs.") (sha256 (base32 "1v2r4ga58kk1sx0frn8qa8ccmjpic9csqzpk499wc95y9c4b1wy3")) - (patches (list (search-patch "hop-bigloo-4.0b.patch") - (search-patch "hop-linker-flags.patch"))))) + (patches (search-patches "hop-bigloo-4.0b.patch" + "hop-linker-flags.patch")))) (build-system gnu-build-system) (arguments `(#:phases @@ -374,7 +374,7 @@ language standard, and includes many enhancements and extensions.") (sha256 (base32 "1x4xfm3lyz2piqcw1h01vbs1iq89zq7wrsfjgh3fxnlm1slj2jcw")) - (patches (list (search-patch "scheme48-tests.patch"))))) + (patches (search-patches "scheme48-tests.patch")))) (build-system gnu-build-system) (home-page "http://s48.org/") (synopsis "Scheme implementation using a bytecode interpreter") diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm index 088ca559d8..4b9bacf3e5 100644 --- a/gnu/packages/screen.scm +++ b/gnu/packages/screen.scm @@ -107,7 +107,7 @@ controlling terminal and attach to it later.") (sha256 (base32 "1s8nh4wbds1nh52i0d1hy1b308jjf4siwpq92lna1zh9ll4x71j5")) - (patches (list (search-patch "byobu-writable-status.patch"))))) + (patches (search-patches "byobu-writable-status.patch")))) (build-system gnu-build-system) (inputs `(("python" ,python-wrapper) ;for config and session GUIs diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 458fdc599f..49b9deaf4d 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -60,7 +60,7 @@ (sha256 (base32 "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn")) - (patches (list (search-patch "sdl-libx11-1.6.patch"))))) + (patches (search-patches "sdl-libx11-1.6.patch")))) (build-system gnu-build-system) (arguments '(;; Explicitly link against shared libraries instead of dlopening them. diff --git a/gnu/packages/slim.scm b/gnu/packages/slim.scm index 8e25a5a669..dfb37a94bc 100644 --- a/gnu/packages/slim.scm +++ b/gnu/packages/slim.scm @@ -44,9 +44,9 @@ version ".tar.gz")) (sha256 (base32 "1pqhk22jb4aja4hkrm7rjgbgzjyh7i4zswdgf5nw862l2znzxpi1")) - (patches (map search-patch - (list "slim-config.patch" "slim-session.patch" - "slim-sigusr1.patch"))))) + (patches (search-patches "slim-config.patch" + "slim-session.patch" + "slim-sigusr1.patch")))) (build-system cmake-build-system) (inputs `(("linux-pam" ,linux-pam) ("libpng" ,libpng) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index d7f2f363a8..eaf57acb3d 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -82,8 +82,8 @@ remote applications.") (sha256 (base32 "0b6wyx6bwbb8jpn8x4rhlrdiqwqrwrs0mxjmrnqykm9kw1ijgm8g")) - (patches (list - (search-patch "libssh-0.6.5-CVE-2016-0739.patch"))))))) + (patches (search-patches + "libssh-0.6.5-CVE-2016-0739.patch")))))) (define-public libssh2 (package diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 1f301458a9..993842339b 100644 --- a/gnu/packages/tcl.scm +++ b/gnu/packages/tcl.scm @@ -45,7 +45,7 @@ (sha256 (base32 "13cwa4bc85ylf5gfj9vk182lvgy60qni3f7gbxghq78wk16djvly")) - (patches (list (search-patch "tcl-mkindex-deterministic.patch"))))) + (patches (search-patches "tcl-mkindex-deterministic.patch")))) (build-system gnu-build-system) (arguments '(#:phases (alist-cons-before @@ -143,7 +143,7 @@ X11 GUIs.") (sha256 (base32 "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88")) - (patches (list (search-patch "tk-find-library.patch"))))) + (patches (search-patches "tk-find-library.patch")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases @@ -257,7 +257,7 @@ utility functions and modules all written in high-level Tcl.") (sha256 (base32 "0ffb4aw63inig3aql33g4pk0kjk14dv238anp1scwjdjh1k6n4gl")) - (patches (list (search-patch "tclxml-3.2-install.patch"))))) + (patches (search-patches "tclxml-3.2-install.patch")))) (build-system gnu-build-system) (native-inputs `(("tcl" ,tcl) diff --git a/gnu/packages/tcsh.scm b/gnu/packages/tcsh.scm index 0bd1b92b8f..5e3df2ba3f 100644 --- a/gnu/packages/tcsh.scm +++ b/gnu/packages/tcsh.scm @@ -40,7 +40,7 @@ (sha256 (base32 "1a4z9kwgx1iqqzvv64si34m60gj34p7lp6rrcrb59s7ka5wa476q")) - (patches (list (search-patch "tcsh-fix-autotest.patch"))) + (patches (search-patches "tcsh-fix-autotest.patch")) (patch-flags '("-p0")))) (build-system gnu-build-system) (inputs diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 8f5913ac89..4921b10124 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -148,8 +148,8 @@ is on expressing the content semantically, avoiding physical markup commands.") (base32 "1yprv64vrlcbksqv25asplnjg07mbq38lfclp1m5lj8cw878pag8")) (patches - (list (search-patch "texi2html-document-encoding.patch") - (search-patch "texi2html-i18n.patch"))) + (search-patches "texi2html-document-encoding.patch" + "texi2html-i18n.patch")) (snippet ;; This file is modified by the patch above, but reset its ;; timestamp so we don't trigger the rule to update PO files, diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index a9bd3db3db..cb538362b7 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -192,9 +192,8 @@ required structures.") (sha256 (base32 "0cxajjayi859czi545ddafi24m9nwsnjsw4q82zrmqvwj2rv315p")) - (patches (map search-patch - '("openssl-runpath.patch" - "openssl-c-rehash-in.patch"))))) + (patches (search-patches "openssl-runpath.patch" + "openssl-c-rehash-in.patch")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (arguments diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 5fb8f954aa..5155fc09a0 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -80,7 +80,7 @@ applications based on the TCP protocol.") (base32 "0an2q5ail9z414riyjbkjkm29504hy778j914baz2gn5hlv2cfak")) (file-name (string-append name "-" version "-checkout")) - (patches (list (search-patch "torsocks-dns-test.patch"))))) + (patches (search-patches "torsocks-dns-test.patch")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/tv.scm b/gnu/packages/tv.scm index 0a229e149a..f58c03623e 100644 --- a/gnu/packages/tv.scm +++ b/gnu/packages/tv.scm @@ -39,10 +39,10 @@ (sha256 (base32 "08q5gzbyz0lxb730rz6d6amkzimlc7nanv6n50j2bpw4n2xa9wmf")) - (patches (list (search-patch "tvtime-videodev2.patch") - (search-patch "tvtime-pngoutput.patch") - (search-patch "tvtime-xmltv.patch") - (search-patch "tvtime-gcc41.patch"))))) + (patches (search-patches "tvtime-videodev2.patch" + "tvtime-pngoutput.patch" + "tvtime-xmltv.patch" + "tvtime-gcc41.patch")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm index 5cfbe6d554..ed847c2def 100644 --- a/gnu/packages/valgrind.scm +++ b/gnu/packages/valgrind.scm @@ -38,7 +38,7 @@ (sha256 (base32 "0hiv871b9bk689mv42mkhp76za78l5773glszfkdbpf1m1qn4fbc")) - (patches (map search-patch '("valgrind-enable-arm.patch"))))) + (patches (search-patches "valgrind-enable-arm.patch")))) (build-system gnu-build-system) (arguments '(#:phases (alist-cons-after diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 0b70d545b9..3be89ce06e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -896,8 +896,8 @@ large, complex patch files.") (sha256 (base32 "0bkw6fjh20ppvn54smv05461lm1vcwvn02avx941c4acafmkl1cm")) - (patches (list (search-patch "cssc-gets-undeclared.patch") - (search-patch "cssc-missing-include.patch"))))) + (patches (search-patches "cssc-gets-undeclared.patch" + "cssc-missing-include.patch")))) (build-system gnu-build-system) (arguments `(#:phases (alist-cons-before @@ -940,11 +940,11 @@ accessed and migrated on modern systems.") (sha256 (base32 "18s86ssarfmc4l17gbpzybca29m5wa37cbaimdji8czlcry3mcjl")) - (patches (list (search-patch "aegis-perl-tempdir1.patch") - (search-patch "aegis-perl-tempdir2.patch") - (search-patch "aegis-test-fixup-1.patch") - (search-patch "aegis-test-fixup-2.patch") - (search-patch "aegis-constness-error.patch"))))) + (patches (search-patches "aegis-perl-tempdir1.patch" + "aegis-perl-tempdir2.patch" + "aegis-test-fixup-1.patch" + "aegis-test-fixup-2.patch" + "aegis-constness-error.patch")))) (build-system gnu-build-system) (inputs `(("e2fsprogs" ,e2fsprogs) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d2f9cb1930..7673636b15 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -132,10 +132,10 @@ old-fashioned output methods with powerful ascii-art renderer.") (sha256 (base32 "0czccp4fcpf2ykp16xcrzdfmnircz1ynhls334q374xknd5747d2")) - (patches (map search-patch '("liba52-enable-pic.patch" - "liba52-set-soname.patch" - "liba52-use-mtune-not-mcpu.patch" - "liba52-link-with-libm.patch"))))) + (patches (search-patches "liba52-enable-pic.patch" + "liba52-set-soname.patch" + "liba52-use-mtune-not-mcpu.patch" + "liba52-link-with-libm.patch")))) (build-system gnu-build-system) ;; XXX We need to run ./bootstrap because of the build system fixes above. (native-inputs @@ -1007,7 +1007,7 @@ for use with HTML5 video.") (sha256 (base32 "1vas43bwb15q2wv3dpp7fgp8dc6szinmwl7i0ziq2vv5l2128v0p")) - (patches (map search-patch '("avidemux-install-to-lib.patch"))))) + (patches (search-patches "avidemux-install-to-lib.patch")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config))) diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 34dacecdc5..d7c2616dfe 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -67,7 +67,7 @@ endpoints.") version ".tar.gz")) (sha256 (base32 "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6")) - (patches (list (search-patch "vpnc-script.patch"))))) + (patches (search-patches "vpnc-script.patch")))) (build-system gnu-build-system) (inputs `(("libgcrypt" ,libgcrypt) ("perl" ,perl) diff --git a/gnu/packages/vtk.scm b/gnu/packages/vtk.scm index 17312103dd..13ce2e2ac0 100644 --- a/gnu/packages/vtk.scm +++ b/gnu/packages/vtk.scm @@ -39,7 +39,7 @@ (sha256 (base32 "0d7shccdkyj4mbh2riilslgx3gd28in4c7xpm0lxa1ln8w5g2zdx")) - (patches (list (search-patch "vtk-mesa-10.patch"))))) + (patches (search-patches "vtk-mesa-10.patch")))) (build-system cmake-build-system) (arguments ;; Build without '-g' to save space. diff --git a/gnu/packages/w3m.scm b/gnu/packages/w3m.scm index 45c9375def..42141fb04d 100644 --- a/gnu/packages/w3m.scm +++ b/gnu/packages/w3m.scm @@ -44,10 +44,10 @@ "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579")) ;; cf. https://bugs.archlinux.org/task/33397 - (patches (list (search-patch "w3m-libgc.patch") - (search-patch "w3m-force-ssl_verify_server-on.patch") - (search-patch "w3m-disable-sslv2-and-sslv3.patch") - (search-patch "w3m-disable-weak-ciphers.patch"))))) + (patches (search-patches "w3m-libgc.patch" + "w3m-force-ssl_verify_server-on.patch" + "w3m-disable-sslv2-and-sslv3.patch" + "w3m-disable-weak-ciphers.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no check target #:phases (alist-cons-before diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1f13474e95..617df198a6 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -402,7 +402,7 @@ UTS#46.") (sha256 (base32 "14dsnmirjcrvwsffqp3as70qr6bbfaig2fv3zvs5g7005jrsbvpb")) - (patches (list (search-patch "tidy-CVE-2015-5522+5523.patch"))))) + (patches (search-patches "tidy-CVE-2015-5522+5523.patch")))) (build-system gnu-build-system) (arguments '(#:phases (alist-cons-after @@ -605,8 +605,8 @@ from streaming URLs. It is a command-line wrapper for the libquvi library.") version ".tar.bz2")) (sha256 (base32 "14155g48gamcv5s0828bzij6vr14nqmbndwq8j8f9g6vcph0nl70")) - (patches (map search-patch '("serf-comment-style-fix.patch" - "serf-deflate-buckets-test-fix.patch"))) + (patches (search-patches "serf-comment-style-fix.patch" + "serf-deflate-buckets-test-fix.patch")) (patch-flags '("-p0")))) (build-system gnu-build-system) (native-inputs @@ -1718,8 +1718,8 @@ which can be used to parse directory listings.") (sha256 (base32 "1b6pbh7f76fb5sa4f0lhx085xy55pprz5v7z7li7pqiyw7i4f4bf")) - (patches (list - (search-patch "perl-finance-quote-unuse-mozilla-ca.patch"))))) + (patches (search-patches + "perl-finance-quote-unuse-mozilla-ca.patch")))) (build-system perl-build-system) (propagated-inputs `(("perl-cgi" ,perl-cgi) @@ -2288,9 +2288,8 @@ and IPv6 sockets, intended as a replacement for IO::Socket::INET.") (sha256 (base32 "1mph52lw6x5v44wf8mw00llzi8pp6k5c4jnrnrvlacrlfv260jb8")) - (patches - (list - (search-patch "perl-io-socket-ssl-openssl-1.0.2f-fix.patch"))))) + (patches (search-patches + "perl-io-socket-ssl-openssl-1.0.2f-fix.patch")))) (build-system perl-build-system) (propagated-inputs `(("perl-net-ssleay" ,perl-net-ssleay))) (synopsis "Nearly transparent SSL encapsulation for IO::Socket::INET") @@ -2418,8 +2417,8 @@ and retry a few times.") (sha256 (base32 "10dcsq4s2kc9cb1vccx17r187c81drirc3s1hbxh3rb8489kg2b2")) - (patches (list - (search-patch "perl-net-amazon-s3-moose-warning.patch"))))) + (patches (search-patches + "perl-net-amazon-s3-moose-warning.patch")))) (build-system perl-build-system) (native-inputs `(("perl-libwww" ,perl-libwww) diff --git a/gnu/packages/wicd.scm b/gnu/packages/wicd.scm index 350baf7373..f9aa657e56 100644 --- a/gnu/packages/wicd.scm +++ b/gnu/packages/wicd.scm @@ -46,11 +46,11 @@ "/+download/wicd-" version ".tar.gz")) (sha256 (base32 "0qpbwwsrqdp40mm3a8djpn2d055rxxspdhwijwsdnws700a9d637")) - (patches (map search-patch - '("wicd-bitrate-none-fix.patch" - "wicd-get-selected-profile-fix.patch" - "wicd-urwid-1.3.patch" - "wicd-wpa2-ttls.patch"))))) + (patches (search-patches + "wicd-bitrate-none-fix.patch" + "wicd-get-selected-profile-fix.patch" + "wicd-urwid-1.3.patch" + "wicd-wpa2-ttls.patch")))) (build-system python-build-system) (native-inputs `(("gettext" ,gnu-gettext))) (inputs `(("dbus-glib" ,dbus-glib) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a63e597599..60842efab2 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -286,7 +286,7 @@ tiling window manager for X.") (sha256 (base32 "0ak0yajzk3v4dg5wmaghv6acf7v02a4iw8qxmq5yw5ard8lrqn3r")) - (patches (map search-patch '("evilwm-lost-focus-bug.patch"))))) + (patches (search-patches "evilwm-lost-focus-bug.patch")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index a999857ecb..126e997673 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -135,7 +135,7 @@ avoiding password prompts when X11 forwarding has already been setup.") (sha256 (base32 "1lcngsw33fy9my21rdiz1gs474bfdqcfxjrnfggbx4aypn1nhcp8")) - (patches (list (search-patch "xdotool-fix-makefile.patch"))))) + (patches (search-patches "xdotool-fix-makefile.patch")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; Test suite requires a lot of black magic @@ -233,7 +233,7 @@ rasterisation.") (sha256 (base32 "1i4n7mz49l0j4kr0dg9n1j3hlc786ncqgj0v5fci1mz7pp40m5ki")) - (patches (list (search-patch "libdrm-symbol-check.patch"))))) + (patches (search-patches "libdrm-symbol-check.patch")))) (build-system gnu-build-system) (inputs `(("libpciaccess" ,libpciaccess) @@ -315,7 +315,7 @@ System style license, and has no special dependencies.") (sha256 (base32 "1afclc57b9017a73mfs9w7lbdvdipmf9q0xdk116f61gnvyix2np")) - (patches (list (search-patch "wmctrl-64-fix.patch"))))) + (patches (search-patches "wmctrl-64-fix.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 03b49a86ac..89071e991d 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -272,7 +272,7 @@ management D-Bus specification.") (sha256 (base32 "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih")) - (patches (list (search-patch "xfce4-panel-plugins.patch"))))) + (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-gtk3"))) @@ -467,7 +467,7 @@ your system in categories, so you can quickly find and launch them.") "01kvbd09c06j20n155hracsgrq06rlmfgdywffjsvlwpn19m9j38")) (patches ;; See: https://bugzilla.xfce.org/show_bug.cgi?id=12282 - (list (search-patch "xfce4-session-fix-xflock4.patch"))) + (search-patches "xfce4-session-fix-xflock4.patch")) (modules '((guix build utils))) (snippet '(begin @@ -510,8 +510,7 @@ allows you to shutdown the computer from Xfce.") (sha256 (base32 "108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4")) - (patches - (list (search-patch "xfce4-settings-defaults.patch"))))) + (patches (search-patches "xfce4-settings-defaults.patch")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 1e157a4c96..83bed814f9 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -111,7 +111,7 @@ polyphonic) audio and music at fixed and variable bitrates from 16 to (sha256 (base32 "0q8wark9ribij57dciym5vdikg2464p8q2mgqvfb78ksjh4s8vgk")) - (patches (list (search-patch "libtheora-config-guess.patch"))))) + (patches (search-patches "libtheora-config-guess.patch")))) (build-system gnu-build-system) (inputs `(("libvorbis" ,libvorbis))) ;; The .pc files refer to libogg. @@ -267,7 +267,7 @@ Kate stream.") (sha256 (base32 "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3")) - (patches (list (search-patch "vorbis-tools-CVE-2015-6749.patch"))))) + (patches (search-patches "vorbis-tools-CVE-2015-6749.patch")))) (build-system gnu-build-system) (inputs `(("ao" ,ao) ("curl" ,curl) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 7419c61d3a..e1f111e329 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -52,7 +52,7 @@ (sha256 (base32 "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2")) - (patches (list (search-patch "expat-CVE-2015-1283.patch"))))) + (patches (search-patches "expat-CVE-2015-1283.patch")))) (build-system gnu-build-system) (home-page "http://www.libexpat.org/") (synopsis "Stream-oriented XML parser library written in C") @@ -132,7 +132,7 @@ project (but it is usable outside of the Gnome platform).") (sha256 (base32 "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz")) - (patches (list (search-patch "libxslt-CVE-2015-7995.patch"))))) + (patches (search-patches "libxslt-CVE-2015-7995.patch")))) (build-system gnu-build-system) (home-page "http://xmlsoft.org/XSLT/index.html") (synopsis "C library for applying XSLT stylesheets to XML documents") @@ -654,7 +654,7 @@ UTF-8 and UTF-16 encoding.") (sha256 (base32 "14smciid19lvkxqznfig77jxn5s4iq3jpb47vh5a6zcaqp7gvg8m")) - (patches (list (search-patch "tinyxml-use-stl.patch"))))) + (patches (search-patches "tinyxml-use-stl.patch")))) (build-system gnu-build-system) ;; This library is missing *a lot* of the steps to make it usable, so we ;; have to add them here, like every other distro must do. diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 4cf466883b..fd933e36a7 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1514,7 +1514,7 @@ treat it as part of their software base when porting.") "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h")) ;; See https://bugs.freedesktop.org/show_bug.cgi?id=47792; ;; should become obsolete with the next release. - (patches (list (search-patch "luit-posix.patch"))))) + (patches (search-patches "luit-posix.patch")))) (build-system gnu-build-system) (inputs `(("libfontenc" ,libfontenc))) @@ -2577,7 +2577,7 @@ as USB mice.") (sha256 (base32 "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466")) - (patches (list (search-patch "xf86-video-ark-remove-mibstore.patch"))))) + (patches (search-patches "xf86-video-ark-remove-mibstore.patch")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -2603,7 +2603,7 @@ as USB mice.") ;; (sha256 ;; (base32 ;; "1q64z8qqa0ix3cymqiwk1s3sphd1fvvz30lvyxhgkgciygz6dm69")) -;; (patches (list (search-patch "xf86-video-ast-remove-mibstore.patch"))))) +;; (patches (search-patches "xf86-video-ast-remove-mibstore.patch")))) ;; (build-system gnu-build-system) ;; (inputs `(("xorg-server" ,xorg-server))) ;; (native-inputs `(("pkg-config" ,pkg-config))) @@ -2711,7 +2711,7 @@ framebuffer device.") (sha256 (base32 "1s59kdj573v38sb14xfhp1l926aypbhy11vaz36y72x6calfkv6n")) - (patches (list (search-patch "xf86-video-geode-glibc-2.20.patch"))))) + (patches (search-patches "xf86-video-geode-glibc-2.20.patch")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -2770,8 +2770,7 @@ compositing. Both support Xv overlay and dynamic rotation with XRandR.") (sha256 (base32 "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5")) - (patches (list - (search-patch "xf86-video-glint-remove-mibstore.patch"))))) + (patches (search-patches "xf86-video-glint-remove-mibstore.patch")))) (build-system gnu-build-system) (inputs `(("xf86dgaproto" ,xf86dgaproto) ("xorg-server" ,xorg-server))) @@ -2798,8 +2797,7 @@ X server.") (sha256 (base32 "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq")) - (patches (list - (search-patch "xf86-video-i128-remove-mibstore.patch"))))) + (patches (search-patches "xf86-video-i128-remove-mibstore.patch")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -2870,7 +2868,7 @@ It supports a variety of Intel graphics chipsets.") (sha256 (base32 "07xlf5nsjm0x18ij5gyy4lf8hwpl10i8chi3skpqjh84drdri61y")) - (patches (list (search-patch "xf86-video-mach64-glibc-2.20.patch"))))) + (patches (search-patches "xf86-video-mach64-glibc-2.20.patch")))) (build-system gnu-build-system) (inputs `(("mesa" ,mesa) ("xf86driproto" ,xf86driproto) @@ -3005,7 +3003,7 @@ kernel mode setting (KMS).") (sha256 (base32 "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3")) - (patches (list (search-patch "xf86-video-nv-remove-mibstore.patch"))))) + (patches (search-patches "xf86-video-nv-remove-mibstore.patch")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config))) @@ -3057,8 +3055,7 @@ graphics cards.") (sha256 (base32 "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4")) - (patches (list - (search-patch "xf86-video-openchrome-glibc-2.20.patch"))))) + (patches (search-patches "xf86-video-openchrome-glibc-2.20.patch")))) (build-system gnu-build-system) (inputs `(("libx11" ,libx11) ("libxext" ,libxext) @@ -3272,7 +3269,7 @@ This driver supports SiS chipsets of 300/315/330/340 series.") (sha256 (base32 "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0")) - (patches (list (search-patch "xf86-video-tga-remove-mibstore.patch"))))) + (patches (search-patches "xf86-video-tga-remove-mibstore.patch")))) (build-system gnu-build-system) (inputs `(("xf86dgaproto" ,xf86dgaproto) ("xorg-server" ,xorg-server))) @@ -3887,7 +3884,7 @@ protocol.") (sha256 (base32 "0y649an3jqfq9klkp9y5gj20xb78fw6g193f5mnzpl0hbz6fbc5p")) - (patches (list (search-patch "xmodmap-asprintf.patch"))))) + (patches (search-patches "xmodmap-asprintf.patch")))) (build-system gnu-build-system) (inputs `(("xproto" ,xproto) diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm index b7bed0e86d..6defbda49e 100644 --- a/gnu/packages/zip.scm +++ b/gnu/packages/zip.scm @@ -81,19 +81,19 @@ Compression ratios of 2:1 to 3:1 are common for text files.") (sha256 (base32 "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83")) - (patches (map search-patch '("unzip-CVE-2014-8139.patch" - "unzip-CVE-2014-8140.patch" - "unzip-CVE-2014-8141.patch" - "unzip-CVE-2014-9636.patch" - "unzip-CVE-2015-7696.patch" - "unzip-CVE-2015-7697.patch" - "unzip-allow-greater-hostver-values.patch" - "unzip-initialize-symlink-flag.patch" - "unzip-remove-build-date.patch" - "unzip-attribs-overflow.patch" - "unzip-overflow-on-invalid-input.patch" - "unzip-format-secure.patch" - "unzip-overflow-long-fsize.patch"))))) + (patches (search-patches "unzip-CVE-2014-8139.patch" + "unzip-CVE-2014-8140.patch" + "unzip-CVE-2014-8141.patch" + "unzip-CVE-2014-9636.patch" + "unzip-CVE-2015-7696.patch" + "unzip-CVE-2015-7697.patch" + "unzip-allow-greater-hostver-values.patch" + "unzip-initialize-symlink-flag.patch" + "unzip-remove-build-date.patch" + "unzip-attribs-overflow.patch" + "unzip-overflow-on-invalid-input.patch" + "unzip-format-secure.patch" + "unzip-overflow-long-fsize.patch")))) (build-system gnu-build-system) ;; no inputs; bzip2 is not supported, since not compiled with BZ_NO_STDIO (arguments -- cgit v1.2.3