From 2847d833be9ad44dfe3dd4649351d71a2511c169 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 May 2018 21:42:56 +0200 Subject: gnu: python-oslo.utils: Update to 3.36.2. * gnu/packages/openstack.scm (python-oslo.utils): Update to 3.36.2. --- gnu/packages/openstack.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 3e9fd375c9..64e05c4b0e 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -680,14 +680,14 @@ (define-public python2-oslotest (define-public python-oslo.utils (package (name "python-oslo.utils") - (version "3.36.0") + (version "3.36.2") (source (origin (method url-fetch) (uri (pypi-uri "oslo.utils" version)) (sha256 (base32 - "0zvm31qdvqywxppqdjwbxxsqaga3dg4slpvbbmqqm9ig4n78mhay")))) + "1ipjcgg9z697wmibhcbg5lqpk5gafakdx4qkff3w255zr0mvw04r")))) (build-system python-build-system) (propagated-inputs `(("python-debtcollector" ,python-debtcollector) -- cgit v1.2.3 From 3fe0d360277c2593638c4957346d00e951899644 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 29 May 2018 21:51:12 +0200 Subject: gnu: perl-text-format: Update to 0.61. * gnu/packages/perl.scm (perl-text-format): Update to 0.61. --- gnu/packages/perl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index f6c8f7dbcd..702d89e4f2 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -8235,7 +8235,7 @@ (define-public perl-text-diff (define-public perl-text-format (package (name "perl-text-format") - (version "0.60") + (version "0.61") (source (origin (method url-fetch) (uri (string-append @@ -8243,7 +8243,7 @@ (define-public perl-text-format version ".tar.gz")) (sha256 (base32 - "1f52jak0a2gwi4qcisp4nfbniq04dmmv5j8zkvzj8ik0f0sk2kv6")))) + "0axfyiml3zwawwd127z8rl2lm53z6dlsflzmp80m3j0myn7kp2mv")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build) -- cgit v1.2.3 From cfcd9a45517dadeca9f47e80dc9b1df0b7ef59d0 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Tue, 29 May 2018 19:43:28 +0200 Subject: gnu: wireshark: End phase with #t. * gnu/packages/networking.scm (wireshark)[arguments]: End 'patch-source' phase with #t. --- gnu/packages/networking.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index b9ffbf6e81..d4cfffcc3f 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -603,7 +603,8 @@ (define-public wireshark #include ")) (substitute* "ui/qt/wireless_frame.cpp" (("#include ") "#include -#include "))))))) +#include ")) + #t))))) (synopsis "Network traffic analyzer") (description "Wireshark is a network protocol analyzer, or @dfn{packet sniffer}, that lets you capture and interactively browse the contents of -- cgit v1.2.3 From d0e23e3940bb122cca5657e89e14ae5b7db49be4 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 18 Apr 2018 21:32:46 -0400 Subject: gnu: vlc: Update to 3.0.3, and add more inputs. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Roel Janssen * gnu/packages/video.scm (vlc): Update to 3.0.3. [native-inputs]: Add flex, bison, and gettext-minimal. [inputs]: Replace ffmpeg-2.8 with the latest ffmpeg. Replace lua-5.1 with lua-5.2. Add eudev, fribidi, libarchive, libass, libavc1394, libbluray, libcaca, libdca, libdvdnav, libdvdread, libebml, libidn, libmatroska, libmodplug, libmpeg2, libraw1394, librsvg, libsecret, libupnp, libva, libvdpau, libvpx, libx264, qtsvg, samba, speexdsp, taglib, twolame, unzip, wayland, and wayland-protocols. [arguments]: Add BUILDCC=gcc to configure-flags. In the 'patch-source' phase, remove a vestigial substitution fix, enable the use of fribidi deprecated interfaces, and adjust the file names in substitutions from "gui/qt4" to "gui/qt". Move the 'regenerate-plugin-cache' phase after 'strip', and in it, set the timestamps to 1 second after the epoch, and use 'invoke'. Add new 'wrap-executable' phase. Signed-off-by: Clément Lassieur --- gnu/packages/video.scm | 81 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 67 insertions(+), 14 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 317710c76b..8464370d28 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016 Andreas Enge ;;; Copyright © 2014, 2015, 2016 David Thompson -;;; Copyright © 2014, 2015, 2016 Mark H Weaver +;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner ;;; Copyright © 2015 Andy Patterson @@ -63,6 +63,7 @@ (define-module (gnu packages video) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages avahi) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages boost) @@ -94,6 +95,7 @@ (define-module (gnu packages video) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages iso-codes) + #:use-module (gnu packages libidn) #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages lua) @@ -110,7 +112,9 @@ (define-module (gnu packages video) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages qt) + #:use-module (gnu packages rdesktop) #:use-module (gnu packages ruby) + #:use-module (gnu packages samba) #:use-module (gnu packages sdl) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) @@ -118,6 +122,7 @@ (define-module (gnu packages video) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) + #:use-module (gnu packages upnp) #:use-module (gnu packages version-control) #:use-module (gnu packages vulkan) #:use-module (gnu packages web) @@ -810,7 +815,7 @@ (define-public ffmpeg-2.8 (define-public vlc (package (name "vlc") - (version "2.2.8") + (version "3.0.3") (source (origin (method url-fetch) (uri (string-append @@ -818,55 +823,90 @@ (define-public vlc version "/vlc-" version ".tar.xz")) (sha256 (base32 - "1v32snw46rkgbdqdy3dssl2y13i8p2cr1cw1i18r6vdmiy24dw4v")))) + "0lavzly8l0ll1d9iris9cnirgcs77g48lxj14058dxqkvd5v1a4v")))) (build-system gnu-build-system) (native-inputs - `(("git" ,git) ; needed for a test + `(("flex" ,flex) + ("bison" ,bison) + ("gettext" ,gettext-minimal) + ("git" ,git) ; needed for a test ("pkg-config" ,pkg-config))) ;; FIXME: Add optional inputs once available. (inputs `(("alsa-lib" ,alsa-lib) ("avahi" ,avahi) ("dbus" ,dbus) + ("eudev" ,eudev) ("flac" ,flac) - ("ffmpeg" ,ffmpeg-2.8) ;fails to build against ffmpeg 3.0 + ("ffmpeg" ,ffmpeg) ("fontconfig" ,fontconfig) ("freetype" ,freetype) + ("fribidi" ,fribidi) ("gnutls" ,gnutls) ("liba52" ,liba52) + ("libarchive" ,libarchive) + ("libass" ,libass) + ("libavc1394" ,libavc1394) + ("libbluray" ,libbluray) + ("libcaca" ,libcaca) ("libcddb" ,libcddb) + ("libdca" ,libdca) ("libdvbpsi" ,libdvbpsi) + ("libdvdnav" ,libdvdnav) + ("libdvdread" ,libdvdread) + ("libebml" ,libebml) ("libgcrypt" ,libgcrypt) + ("libidn" ,libidn) ("libkate" ,libkate) ("libmad" ,libmad) + ("libmatroska" ,libmatroska) + ("libmodplug" ,libmodplug) + ("libmpeg2" ,libmpeg2) ("libogg" ,libogg) ("libpng" ,libpng) + ("libraw1394" ,libraw1394) + ("librsvg" ,librsvg) ("libsamplerate" ,libsamplerate) + ("libsecret" ,libsecret) ("libssh2" ,libssh2) + ("libupnp" ,libupnp) + ("libva" ,libva) + ("libvdpau" ,libvdpau) ("libvorbis" ,libvorbis) + ("libvpx" ,libvpx) ("libtheora" ,libtheora) + ("libx264" ,libx264) ("libxext" ,libxext) ("libxi" ,libxi) ("libxinerama" ,libxinerama) ("libxml2" ,libxml2) ("libxpm" ,libxpm) ("livemedia-utils" ,livemedia-utils) - ("lua" ,lua-5.1) + ("lua" ,lua-5.2) ("mesa" ,mesa) ("opus" ,opus) ("perl" ,perl) ("pulseaudio" ,pulseaudio) ("python" ,python-wrapper) ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) ("qtx11extras" ,qtx11extras) + ("samba" ,samba) ("sdl" ,sdl) ("sdl-image" ,sdl-image) ("speex" ,speex) + ("speexdsp" ,speexdsp) + ("taglib" ,taglib) + ("twolame" ,twolame) + ("unzip" ,unzip) + ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) ("x265" ,x265) ("xcb-util-keysyms" ,xcb-util-keysyms))) (arguments `(#:configure-flags `("CXXFLAGS=-std=gnu++11" + "BUILDCC=gcc" ,(string-append "LDFLAGS=-Wl,-rpath -Wl," (assoc-ref %build-inputs "ffmpeg") "/lib")) ;needed for the tests @@ -883,18 +923,24 @@ (define-public vlc ;; which fails in our sandboxed build system (substitute* "test/run_vlc.sh" (("./vlc --ignore-config") "echo")) - ;; XXX Likely not needed for >2.2.6. - (substitute* "modules/gui/qt4/components/interface_widgets.cpp" - (("") "")) + + ;; modules/text_renderer/freetype/text_layout.c uses a + ;; now-deprecated interface 'fribidi_get_par_embedding_levels' + ;; from fribidi.h, so for now we enable the use of deprecated + ;; fribidi interfaces from this file. + ;; FIXME: Try removing this for vlc >= 3.0.3. + (substitute* "modules/text_renderer/freetype/text_layout.c" + (("# define FRIBIDI_NO_DEPRECATED 1") "")) + ;; Fix build against Qt 5.11. - (substitute* "modules/gui/qt4/actions_manager.cpp" + (substitute* "modules/gui/qt/actions_manager.cpp" (("#include ") "#include #include ")) - (substitute* "modules/gui/qt4/components/simple_preferences.cpp" + (substitute* "modules/gui/qt/components/simple_preferences.cpp" (("#include ") "#include #include ")) #t))) - (add-after 'install 'regenerate-plugin-cache + (add-after 'strip 'regenerate-plugin-cache (lambda* (#:key outputs #:allow-other-keys) ;; The 'install-exec-hook' rule in the top-level Makefile.am ;; generates 'lib/vlc/plugins/plugins.dat', a plugin cache, using @@ -911,9 +957,16 @@ (define-public vlc (for-each (lambda (file) (let ((s (lstat file))) (unless (eq? (stat:type s) 'symlink) - (utime file 0 0 0 0)))) + (utime file 1 1)))) (find-files plugindir)) - (zero? (system* cachegen plugindir)))))))) + (invoke cachegen plugindir)))) + (add-after 'install 'wrap-executable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (plugin-path (getenv "QT_PLUGIN_PATH"))) + (wrap-program (string-append out "/bin/vlc") + `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)))) + #t))))) (home-page "https://www.videolan.org/") (synopsis "Audio and video framework") (description "VLC is a cross-platform multimedia player and framework -- cgit v1.2.3 From 6f8f98df7f90fd18795f832c32e8d84557a24c0b Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Tue, 29 May 2018 19:26:21 +0200 Subject: gnu: scribus: Fix build against Qt 5.11. * gnu/packages/scribus.scm (scribus)[arguments]: Add a 'patch-source' phase that includes missing headers. --- gnu/packages/scribus.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 860d346778..ea6418c32a 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2016 Efraim Flashner ;;; Copyright © 2017 Nicolas Goaziou +;;; Copyright © 2018 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -84,6 +85,20 @@ (define-public scribus '("-DWANT_GRAPHICSMAGICK=1") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda _ + ;; Fix build against Qt 5.11. + (substitute* "scribus/plugins/tools/lenseffects/lensdialog.cpp" + (("#include ") "#include +#include ")) + (substitute* "scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp" + (("#include ") "#include +#include ")) + (substitute* "scribus/sclistboxpixmap.h" + (("#include ") "#include +#include +#include ")) + #t)) (add-after 'install 'wrap-program (lambda* (#:key inputs outputs #:allow-other-keys) ;; Fix "ImportError: No module named _sysconfigdata_nd" where -- cgit v1.2.3 From 13fcbf3cce197f8a90ed2eea8c4701932eb4f760 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 30 May 2018 14:57:22 -0400 Subject: gnu: linux-libre@4.4: Update to 4.4.134. * gnu/packages/linux.scm (linux-libre-4.4): Update to 4.4.134. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index fd4f0a58e0..bf32ef445d 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -420,8 +420,8 @@ (define-public linux-libre-4.9 #:configuration-file kernel-config)) (define-public linux-libre-4.4 - (make-linux-libre "4.4.133" - "05qc9smcvxd68d46l5gjhvihhnidkiymqh4fv4nyagzv555q7na7" + (make-linux-libre "4.4.134" + "137mklzyv56yhc48l5h5i0h01gm1q40x2a8nk51lwhbjv592xr8x" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From f9e1c2d72a67e953ae23549b39dab4bd1998e8e3 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 30 May 2018 14:58:09 -0400 Subject: gnu: linux-libre@4.9: Update to 4.9.104. * gnu/packages/linux.scm (linux-libre-4.9): Update to 4.9.104. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index bf32ef445d..878187d8c7 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -414,8 +414,8 @@ (define-public linux-libre-4.14 #:configuration-file kernel-config)) (define-public linux-libre-4.9 - (make-linux-libre "4.9.103" - "00g58y92pmb6xf9lhjrab2jrjv3naw3857pf9s43dvh6fwlbccbf" + (make-linux-libre "4.9.104" + "0b6y24vfsjhiv7qq7xqx7h9krc81c49dqh0189nm1lhfwciyir57" %intel-compatible-systems #:configuration-file kernel-config)) -- cgit v1.2.3 From 49e67982eb34456a8b1b2bc193031a3c2198f1d9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 30 May 2018 14:58:49 -0400 Subject: gnu: linux-libre@4.14: Update to 4.14.46. * gnu/packages/linux.scm (%linux-libre-4.14-version): Update to 4.14.46. (%linux-libre-4.14-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 878187d8c7..5a9b52ab80 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -404,8 +404,8 @@ (define-public linux-libre %linux-compatible-systems #:configuration-file kernel-config)) -(define %linux-libre-4.14-version "4.14.44") -(define %linux-libre-4.14-hash "0w89y22by17yqk89l1mmhlvz0i4dkp1mjc347nq3zy1llbwiwvnf") +(define %linux-libre-4.14-version "4.14.46") +(define %linux-libre-4.14-hash "17imkhqk3m3djdj0m5h4lqs9cfdh9zq1cz83q8ldyald56rbn622") (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version -- cgit v1.2.3 From 370e87fdbb0577ae19483e53cb40621b94d7ba25 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Wed, 30 May 2018 14:59:47 -0400 Subject: gnu: linux-libre: Update to 4.16.13. * gnu/packages/linux.scm (%linux-libre-version): Update to 4.16.13. (%linux-libre-hash): Update hash. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5a9b52ab80..72a25d5f30 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -395,8 +395,8 @@ (define %linux-compatible-systems '("x86_64-linux" "i686-linux" "armhf-linux" "a ;; supports qemu "virt" machine and possibly a large number of ARM boards. ;; See : https://wiki.debian.org/DebianKernel/ARMMP. -(define %linux-libre-version "4.16.12") -(define %linux-libre-hash "1zjq16z5cdcpa4acqdilavjjv2xbqnh3fmn400n9hd5pzyll817m") +(define %linux-libre-version "4.16.13") +(define %linux-libre-hash "1frpqxv5ykf87hrmh62b8nxxcpv64a5w7lxw51z4vs82799inmng") (define-public linux-libre (make-linux-libre %linux-libre-version -- cgit v1.2.3 From a66fb3a14e11a9e5bf731a7a21fe6c76179b29ff Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 May 2018 17:52:56 +0200 Subject: gnu: isync: Add zlib compression support. This adds ~400 KiB (.5%) to isync's now-73.1 MiB closure. * gnu/packages/mail.scm (isync)[inputs]: Add ZLIB. --- gnu/packages/mail.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index b61d841d21..08a9a2946b 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -1367,7 +1367,8 @@ (define-public isync `(("perl" ,perl))) (inputs `(("bdb" ,bdb) - ("openssl" ,openssl))) + ("openssl" ,openssl) + ("zlib" ,zlib))) (home-page "http://isync.sourceforge.net/") (synopsis "Mailbox synchronization program") (description -- cgit v1.2.3 From 504d16dd044e1a369384f9e9582f4eace6e02f83 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 May 2018 21:16:01 +0200 Subject: gnu: spoon: Update to 0.6. * gnu/packages/suckless.scm (spoon): Update to 0.6. --- gnu/packages/suckless.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 4cd0773062..008dd0d1c0 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -171,7 +171,7 @@ (define-public dmenu (define-public spoon (package (name "spoon") - (version "0.3") + (version "0.6") (source (origin (method url-fetch) @@ -179,16 +179,16 @@ (define-public spoon name "-" version ".tar.gz")) (sha256 (base32 - "10c5i7ykpy7inzzfiw1dh0srpkljycr3blxhvd8160wsvplbws48")))) + "1jpmg9k9f4f3lpz0k3cphqjswlyf8lz2sm8ccifiip93kd4rrdj0")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests + `(#:tests? #f ; no tests #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)))) (inputs `(("libx11" ,libx11) ("libxkbfile" ,libxkbfile) - ("alsa-lib" ,alsa-lib) + ("alsa-lib" ,alsa-lib) ; tinyalsa (unpackaged) would suffice ("libmpdclient" ,libmpdclient))) (home-page "https://git.2f30.org/spoon/") (synopsis "Set dwm status") -- cgit v1.2.3 From fc1a7b58d73089067c37fbf59555dbea598e8160 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 May 2018 21:30:03 +0200 Subject: gnu: st: Update to 0.8.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/suckless.scm (st): Update to 0.8.1. [arguments]: Relax ‘inhibit-terminfo-install’ regular expression. --- gnu/packages/suckless.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 008dd0d1c0..2fb35012b3 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -227,7 +227,7 @@ (define-public slock (define-public st (package (name "st") - (version "0.7") + (version "0.8.1") (source (origin (method url-fetch) @@ -235,7 +235,7 @@ (define-public st version ".tar.gz")) (sha256 (base32 - "00309qiw20rc89696pk8bdr7ik4r1aarik7jxqk8k66cdj80v1zp")))) + "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests @@ -247,14 +247,15 @@ (define-public st (add-after 'unpack 'inhibit-terminfo-install (lambda _ (substitute* "Makefile" - (("\t@tic -s st.info") "")) + (("\ttic .*") "")) #t))))) (inputs `(("libx11" ,libx11) ("libxft" ,libxft) ("fontconfig" ,fontconfig) ("freetype" ,freetype))) - (native-inputs `(("pkg-config" ,pkg-config))) + (native-inputs + `(("pkg-config" ,pkg-config))) (home-page "https://st.suckless.org/") (synopsis "Simple terminal emulator") (description -- cgit v1.2.3 From 8f7c6a5ff79f363a39d3a7108ae245c2e12ad32b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 May 2018 22:08:12 +0200 Subject: gnu: sent: Update to 1. * gnu/packages/suckless.scm (sent): Update to 1. [source]: Switch to URL-FETCH/TARBALL. --- gnu/packages/suckless.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 2fb35012b3..3ff4b2eba5 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -312,19 +312,19 @@ (define-public surf (define-public sent (package (name "sent") - (version "0.2") + (version "1") (source (origin - (method url-fetch) + (method url-fetch/tarbomb) (uri (string-append "https://dl.suckless.org/tools/sent-" version ".tar.gz")) (sha256 (base32 - "0xhh752hwaa26k4q6wvrb9jnpbnylss2aw6z11j7l9rav7wn3fak")))) + "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv")))) (build-system gnu-build-system) (arguments `(#:phases (modify-phases %standard-phases - (delete 'configure)) ;no configuration - #:tests? #f ;no test suite + (delete 'configure)) ; no configuration + #:tests? #f ; no test suite #:make-flags (let ((pkg-config (lambda (flag) (string-append "$(shell pkg-config " flag " " -- cgit v1.2.3 From aa945bf6378b6edcca0502ff7ec6abe57d904405 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 May 2018 22:20:48 +0200 Subject: gnu: human: Update to 0.3. * gnu/packages/suckless.scm (human): Update to 0.3. [source]: Use version as the tag, and GIT-FILE-NAME. --- gnu/packages/suckless.scm | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 3ff4b2eba5..5144d90186 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -527,31 +527,28 @@ (define-public noice "Noice is a small curses-based file browser.") (license license:bsd-2))) -;;; We want some commits that are more recent than the latest release, 0.2 (define-public human - (let ((commit "50c80e6ba12823184b6866e06b955dbd2ccdc5d7") - (revision "1")) - (package - (name "human") - (version (string-append "0.2-" revision "." (string-take commit 7))) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "git://git.2f30.org/human.git") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "18xngm4h9vsyip52zwd79rrp1irzg6rs462lpbp61amf7hj955gn")))) + (package + (name "human") + (version "0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://git.2f30.org/human.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0y0bsmvpwfwb2lwspi6a799y34h1faxc6yfanyw6hygxc8661mga")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests + `(#:tests? #f ; no tests #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases - (delete 'configure)))) ; No configure script + (delete 'configure)))) ; no configure script (home-page "https://git.2f30.org/human/") (synopsis "Convert bytes to human readable formats") (description @@ -560,7 +557,7 @@ (define-public human factorisation, but you can force its output. You can adjust the number of decimals with the @code{SCALE} environment variable.") - (license license:wtfpl2)))) + (license license:wtfpl2))) (define-public fortify-headers (package -- cgit v1.2.3 From 82f22fac9f6e7bd9aab420b24a371f5d692533c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 May 2018 22:44:04 +0200 Subject: gnu: lchat: Update to 0.0.0-3.f951919. * gnu/packages/suckless.scm (lchat): Update to 0.0.0-3.f951919. [arguments]: Run tests. Install man page. --- gnu/packages/suckless.scm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 5144d90186..f127a7b94a 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -680,8 +680,8 @@ (define-public libutf ;; No release tarballs so far. (define-public lchat - (let ((revision "2") - (commit "25d90f4630b45e2b609d2e3daecb32cf5ff065fd")) + (let ((revision "3") + (commit "f95191970fd59c52a8b09cff32bd8d2135cbfc6b")) (package (name "lchat") (version (string-append "0.0.0-" revision "." (string-take commit 7))) @@ -694,24 +694,26 @@ (define-public lchat (file-name (string-append name "-" version "-checkout")) (sha256 (base32 - "0dvljyq3m7rxxkqv7rkmijak6vj8i4db3iq2z988bvf76chz268b")))) + "07pxzziczhzprmjy61k7nl9i1kxpgnad37qkjf5fn4wf06nqdxpl")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; No tests + `(#:test-target "test" #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases - (delete 'configure) ; No configure script + (delete 'configure) ; no configure script (add-before 'build 'libbsd (lambda _ (substitute* "Makefile" (("-lutf") "-lutf -lbsd")))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (man1 (string-append out "/share/man/man1"))) (install-file "lchat" bin) + (install-file "lchat.1" man1) #t)))))) (inputs `(("grep" ,grep) -- cgit v1.2.3 From 2c65c085f955c651e7c041a1ee51abb322fc8b2e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 May 2018 22:50:50 +0200 Subject: gnu: lchat: Mark up description. * gnu/packages/suckless.scm (lchat)[description]: Use @code. --- gnu/packages/suckless.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index f127a7b94a..ed4ec28534 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -724,6 +724,6 @@ (define-public lchat (synopsis "Line chat is a frontend for the irc client ii from suckless") (description "Lchat (line chat) is the little and small brother of cii. -It is a front end for ii-like chat programs. It uses tail(1) -f to get the -chat output in background.") +It is a front end for ii-like chat programs. It uses @code{tail -f} to get the +chat output in the background.") (license license:isc)))) -- cgit v1.2.3 From 1608969b03ad4f4ddfa6ab6b985a4cdabe1bb46f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 May 2018 23:40:09 +0200 Subject: gnu: skalibs: Update to 2.6.4.0. * gnu/packages/skarnet.scm (skalibs): Update to 2.6.4.0. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index a0b482a671..b084ab36d2 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -29,7 +29,7 @@ (define-module (gnu packages skarnet) (define-public skalibs (package (name "skalibs") - (version "2.6.3.1") + (version "2.6.4.0") (source (origin (method url-fetch) @@ -37,7 +37,7 @@ (define-public skalibs version ".tar.gz")) (sha256 (base32 - "108c4vslsfy57892ybbksscrjd4bx444hzzcq2g5wdg2sh0cl245")))) + "1iywavxaw398ifc35xda27cb8hx14viy3kqrzby8fqysx3qp7b1h")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests exist -- cgit v1.2.3 From fc55fe2ef7df42d816770619452e30855be59ef2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 May 2018 23:40:26 +0200 Subject: gnu: s6-rc: Update to 0.4.0.1. * gnu/packages/skarnet.scm (s6-rc): Update to 0.4.0.1. --- gnu/packages/skarnet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/skarnet.scm b/gnu/packages/skarnet.scm index b084ab36d2..21d2eebaa9 100644 --- a/gnu/packages/skarnet.scm +++ b/gnu/packages/skarnet.scm @@ -218,7 +218,7 @@ (define-public s6-networking (define-public s6-rc (package (name "s6-rc") - (version "0.4.0.0") + (version "0.4.0.1") (source (origin (method url-fetch) @@ -226,7 +226,7 @@ (define-public s6-rc version ".tar.gz")) (sha256 (base32 - "1fkg9635cvrf6gw055y346a3n634dy2xiwbypawi68flfprfgf4n")))) + "0p4yczbib626kygr3pdvvay0xwyha92rjnhn79cbx18ywc2n4jsb")))) (build-system gnu-build-system) (inputs `(("skalibs" ,skalibs) ("execline" ,execline) -- cgit v1.2.3 From 512f22f9e8ffe4ac30f09758427926be51de6b23 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 30 May 2018 23:43:49 +0200 Subject: gnu: r-dplyr: Update to 0.7.5. * gnu/packages/statistics.scm (r-dplyr): Update to 0.7.5. [propagated-inputs]: Add r-tidyselect. --- gnu/packages/statistics.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 38d253b1ce..e333d7558f 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -1603,13 +1603,13 @@ (define-public r-tibble (define-public r-dplyr (package (name "r-dplyr") - (version "0.7.4") + (version "0.7.5") (source (origin (method url-fetch) (uri (cran-uri "dplyr" version)) (sha256 (base32 - "1hm8ml7yaraag1ak6kvz2mxx6if568c759ix8a1n9d7va03wj7vv")))) + "0l6smzdgb8w505gyl8gnwlg988a6cmafh3rssiv00rsrd8qqzg9g")))) (build-system r-build-system) (propagated-inputs `(("r-assertthat" ,r-assertthat) @@ -1620,7 +1620,8 @@ (define-public r-dplyr ("r-glue" ,r-glue) ("r-pkgconfig" ,r-pkgconfig) ("r-bindrcpp" ,r-bindrcpp) - ("r-tibble" ,r-tibble))) + ("r-tibble" ,r-tibble) + ("r-tidyselect" ,r-tidyselect))) (native-inputs `(("r-rcpp" ,r-rcpp) ("r-bh" ,r-bh))) -- cgit v1.2.3 From e80c05ac3eca7438b8f2fd43c712e001e455268d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:35:12 +0200 Subject: gnu: ffmpeg: Use INVOKE. * gnu/packages/video.scm (ffmpeg)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/video.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8464370d28..03bde3ff61 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -756,13 +756,13 @@ (define-public ffmpeg (("#! /bin/sh") (string-append "#!" (which "sh")))) (setenv "SHELL" (which "bash")) (setenv "CONFIG_SHELL" (which "bash")) - (zero? (apply system* - "./configure" - (string-append "--prefix=" out) - ;; Add $libdir to the RUNPATH of all the binaries. - (string-append "--extra-ldflags=-Wl,-rpath=" - out "/lib") - configure-flags))))) + (apply invoke + "./configure" + (string-append "--prefix=" out) + ;; Add $libdir to the RUNPATH of all the binaries. + (string-append "--extra-ldflags=-Wl,-rpath=" + out "/lib") + configure-flags)))) (add-before 'check 'set-ld-library-path (lambda _ -- cgit v1.2.3 From 359375e6492020e64355ff140e7fea51e7160323 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:37:34 +0200 Subject: gnu: fcgiwrap: Use INVOKE. * gnu/packages/web.scm (fcgiwrap)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 9f1609591b..0cd6c01d03 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -413,13 +413,13 @@ (define-public fcgiwrap "07y6s4mm86cv7p1ljz94sxnqa89y9amn3vzwsnbq5hrl4vdy0zac")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no tests included + `(#:tests? #f ; no tests included #:make-flags (list "CC=gcc") #:phases (modify-phases %standard-phases (add-after 'unpack 'bootstrap (lambda _ - (zero? (system* "autoreconf" "-vif"))))))) + (invoke "autoreconf" "-vif")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit v1.2.3 From aa0771556e827b0f67a564082bedf8a573e8f73e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:38:24 +0200 Subject: gnu: krona-tools: Use INVOKE. * gnu/packages/web.scm (krona-tools)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0cd6c01d03..c37f70eb28 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -690,8 +690,8 @@ (define-public krona-tools (add-after 'wrap-program 'check (lambda* (#:key inputs outputs #:allow-other-keys) (with-directory-excursion "data" - (zero? (system* (string-append (assoc-ref outputs "out") "/bin/ktImportText") - "ec.tsv")))))))) + (invoke (string-append (assoc-ref outputs "out") "/bin/ktImportText") + "ec.tsv"))))))) (inputs `(("perl" ,perl))) (home-page "https://github.com/marbl/Krona/wiki") -- cgit v1.2.3 From 946e5e8aa182cccdfeb43975db0b660bc83c2590 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:39:32 +0200 Subject: gnu: tipp10: Use INVOKE. * gnu/packages/education.scm (tipp10)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/education.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 72cd7c61ba..03050ffd0a 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016, 2017 Ricardo Wurmus ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017, 2018 Efraim Flashner +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Nicolas Goaziou ;;; ;;; This file is part of GNU Guix. @@ -216,7 +217,7 @@ (define-public tipp10 (substitute* "def/defines.h" (("\"/usr/") (string-append "\"" out "/"))) ;; Recreate Makefile - (zero? (system* "qmake")))))))) + (invoke "qmake"))))))) (inputs `(("qt4" ,qt-4) ("sqlite" ,sqlite))) -- cgit v1.2.3 From b5d587055b5496564f7492ff7ba3a6ea6a7b7b02 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:41:34 +0200 Subject: gnu: tidy: Use INVOKE. * gnu/packages/web.scm (tidy)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index c37f70eb28..e79001cb78 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -855,7 +855,7 @@ (module "tidy") ;; source tree. (copy-recursively "build/gnuauto" ".") (setenv "AUTOMAKE" "automake --foreign") - (zero? (system* "autoreconf" "-vfi"))))))) + (invoke "autoreconf" "-vfi")))))) (native-inputs `(("automake" ,automake) ("autoconf" ,autoconf) -- cgit v1.2.3 From 7f4e5f19fa6f8c2ef325f51690da37eab402872e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:42:27 +0200 Subject: gnu: sassc: Use INVOKE. * gnu/packages/web.scm (sassc)[arguments]: Substitute INVOKE for SYSTEM* and its plumbing. --- gnu/packages/web.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e79001cb78..ace7027847 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1236,11 +1236,9 @@ (define-public sassc (delete 'configure) (add-after 'unpack 'unpack-libsass-and-set-path (lambda* (#:key inputs #:allow-other-keys) - (and (zero? (system* "tar" "xvf" (assoc-ref inputs "libsass"))) - (begin - (setenv "SASS_LIBSASS_PATH" - (string-append (getcwd) "/libsass-" ,version)) - #t))))))) + (invoke "tar" "xvf" (assoc-ref inputs "libsass")) + (setenv "SASS_LIBSASS_PATH" + (string-append (getcwd) "/libsass-" ,version))))))) (inputs `(("libsass" ,libsass))) (synopsis "CSS pre-processor") -- cgit v1.2.3 From 9cd760f13f96b975e7e85e2523c03561f515be2d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:43:12 +0200 Subject: gnu: gumbo-parser: Use INVOKE. * gnu/packages/web.scm (gumbo-parser)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/web.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ace7027847..5776363b75 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4034,7 +4034,8 @@ (define-public gumbo-parser #:phases (modify-phases %standard-phases (add-after 'unpack 'bootstrap - (lambda _ (zero? (system* "sh" "autogen.sh"))))))) + (lambda _ + (invoke "sh" "autogen.sh")))))) ;; The release tarball lacks the generated files. (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From 2cdc719193a2f77cf972219bd4f50eb152fb575f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:44:15 +0200 Subject: gnu: surfraw: Use INVOKE. * gnu/packages/web.scm (surfraw)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5776363b75..0fe9c5bdec 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4786,7 +4786,7 @@ (define-public surfraw (let* ((out (assoc-ref %outputs "out")) (man (string-append out "/share/man/man1"))) (with-directory-excursion man - (zero? (system* "gzip" "elvi.1sr"))))))))) + (invoke "gzip" "elvi.1sr")))))))) (inputs `(("perl" ,perl) ("perl-www-opensearch" ,perl-www-opensearch) -- cgit v1.2.3 From 16b5dafc4db79e0ebf6dbe48d0ed21c25d82edfe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:46:17 +0200 Subject: gnu: httptunnel: Use INVOKE. * gnu/packages/web.scm (httptunnel)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0fe9c5bdec..5a87eb5f6e 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4889,8 +4889,8 @@ (define-public httptunnel (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out"))) (setenv "CONFIG_SHELL" (which "bash")) - (zero? (system* "./configure" - (string-append "--prefix=" out))))))))) + (invoke "./configure" + (string-append "--prefix=" out)))))))) (home-page "http://www.nocrew.org/software/httptunnel.html") (synopsis "Tunnel data connections through HTTP requests") (description "httptunnel creates a bidirectional virtual data connection -- cgit v1.2.3 From b8150fa091ce42c7837c6bfb9be8b96656470df2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:47:52 +0200 Subject: gnu: python-internetarchive: Use INVOKE. * gnu/packages/web.scm (python-internetarchive)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/web.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 5a87eb5f6e..0be62ac12c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5239,12 +5239,12 @@ (define-public python-internetarchive (add-installed-pythonpath inputs outputs) (setenv "PATH" (string-append (assoc-ref outputs "out") "/bin" ":" (getenv "PATH"))) - (zero? (system* "py.test" "-v" "-k" - (string-append - ;; These tests attempt to make a connection to - ;; an external web service. - "not test_get_item_with_kwargs" - " and not test_ia")))))))) + (invoke "py.test" "-v" "-k" + (string-append + ;; These tests attempt to make a connection to + ;; an external web service. + "not test_get_item_with_kwargs" + " and not test_ia"))))))) (propagated-inputs `(("python-requests" ,python-requests) ("python-jsonpatch" ,python-jsonpatch-0.4) -- cgit v1.2.3 From a145d7e9af6452f3514ab130db534e4592a9c2b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:48:34 +0200 Subject: gnu: python-clf: Use INVOKE. * gnu/packages/web.scm (python-clf)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/web.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0be62ac12c..36757ba8f9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5305,14 +5305,15 @@ (define-public python-clf (modify-phases %standard-phases (add-after 'unpack 'get-tests (lambda _ - (copy-file (assoc-ref %build-inputs "test-clf") "test_clf.py"))) + (copy-file (assoc-ref %build-inputs "test-clf") "test_clf.py") + #t)) (replace 'check (lambda _ - (zero? (system* "nosetests" - ;; These tests require internet connection - "--exclude=test_browse" - "--exclude=test_command" - "--exclude=test_search"))))))) + (invoke "nosetests" + ;; These tests require an Internet connection. + "--exclude=test_browse" + "--exclude=test_command" + "--exclude=test_search")))))) (home-page "https://github.com/ncrocfer/clf") (synopsis "Search code snippets on @url{https://commandlinefu.com}") (description "@code{clf} is a command line tool for searching code -- cgit v1.2.3 From 4133914416f6e0d8cc4578d9ab5c1ad02c52fbde Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:49:52 +0200 Subject: gnu: rss-bridge: Use INVOKE. * gnu/packages/web.scm (rss-bridge)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/web.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 36757ba8f9..549db3ff9c 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -5547,9 +5547,8 @@ (define-public rss-bridge "PATH" '("bin") (map (match-lambda ((_ . input) input)) %build-inputs)) (mkdir-p share-rss-bridge) - (system* "tar" "xvf" (assoc-ref %build-inputs "source") - "--strip-components" "1" "-C" share-rss-bridge) - #t)))) + (invoke "tar" "xvf" (assoc-ref %build-inputs "source") + "--strip-components" "1" "-C" share-rss-bridge))))) (home-page "https://github.com/RSS-Bridge/rss-bridge") (synopsis "Generate Atom feeds for social networking websites") (description "rss-bridge generates Atom feeds for social networking -- cgit v1.2.3 From 6c738fe9e7e6a95ce910f5a22e6f2c869075ec2d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:52:59 +0200 Subject: gnu: khal: Use INVOKE. * gnu/packages/calendar.scm (khal)[arguments]: Substitute INVOKE for SYSTEM* and explicitly return #t from phases where needed. --- gnu/packages/calendar.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index d1aa9c256b..79cef99826 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Troy Sankey ;;; Copyright © 2016 Stefan Reichoer +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -110,24 +111,24 @@ (define-public khal (lambda* (#:key inputs outputs #:allow-other-keys) ;; Make installed package available for running the tests (add-installed-pythonpath inputs outputs) - (and - (zero? (system* "make" "--directory=doc/" "man")) - (install-file - "doc/build/man/khal.1" - (string-append (assoc-ref outputs "out") "/share/man/man1"))))) + (invoke "make" "--directory=doc/" "man") + (install-file + "doc/build/man/khal.1" + (string-append (assoc-ref outputs "out") "/share/man/man1")) + #t)) (replace 'check (lambda* (#:key inputs #:allow-other-keys) ;; The tests require us to choose a timezone. (setenv "TZ" (string-append (assoc-ref inputs "tzdata") "/share/zoneinfo/Zulu")) - (zero? (system* "py.test" "tests" "-k" - (string-append - ;; These tests are known to fail in when not - ;; running in a TTY: - ;; https://github.com/pimutils/khal/issues/683 - "not test_printics_read_from_stdin " - "and not test_import_from_stdin")))))))) + (invoke "py.test" "tests" "-k" + (string-append + ;; These tests are known to fail in when not + ;; running in a TTY: + ;; https://github.com/pimutils/khal/issues/683 + "not test_printics_read_from_stdin " + "and not test_import_from_stdin"))))))) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-cov" ,python-pytest-cov) -- cgit v1.2.3 From d840f6b98ad9f2dbfb0c9b28005d5ef8d69892b7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:55:37 +0200 Subject: gnu: xapian: Use INVOKE. * gnu/packages/search.scm (xapian)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/search.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 5c8539d561..e176fd1aa7 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2015, 2016 Eric Bavier ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Ricardo Wurmus +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2018 Adam Massmann ;;; ;;; This file is part of GNU Guix. @@ -64,13 +65,13 @@ (define-public xapian ;; getaddrinfo(). This does not work in the build environment, ;; so exclude those tests. See HACKING for the list of targets. (lambda _ - (zero? (system* "make" - "check-inmemory" - "check-remoteprog" - ;"check-remotetcp" - "check-multi" - "check-glass" - "check-chert"))))))) + (invoke "make" + "check-inmemory" + "check-remoteprog" + ;"check-remotetcp" + "check-multi" + "check-glass" + "check-chert")))))) (synopsis "Search Engine Library") (description "Xapian is a highly adaptable toolkit which allows developers to easily -- cgit v1.2.3 From 3103101ec91ebb8a9d9d15362211fecc660ab459 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:56:45 +0200 Subject: gnu: aalib: Use INVOKE. * gnu/packages/video.scm (aalib)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/video.scm | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 03bde3ff61..5f045279a6 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -160,22 +160,22 @@ (define-public aalib (let ((out (assoc-ref outputs "out")) (ncurses (assoc-ref inputs "ncurses"))) (setenv "CONFIG_SHELL" (which "bash")) - (zero? (system* "./configure" - (string-append "--prefix=" out) - (string-append "--build=" build) - ;; The ancient config.guess is unable to - ;; guess the host triplet on mips64el. - ,@(if (string=? "mips64el-linux" - (%current-system)) - '("--host=mips64el-unknown-linux-gnu") - '()) - ;; The same is also true with aarch64. - ,@(if (string=? "aarch64-linux" - (%current-system)) - '("--host=aarch64-unknown-linux-gnu") - '()) - (string-append "--with-ncurses=" - ncurses))))))))) + (invoke "./configure" + (string-append "--prefix=" out) + (string-append "--build=" build) + ;; The ancient config.guess is unable to + ;; guess the host triplet on mips64el. + ,@(if (string=? "mips64el-linux" + (%current-system)) + '("--host=mips64el-unknown-linux-gnu") + '()) + ;; The same is also true with aarch64. + ,@(if (string=? "aarch64-linux" + (%current-system)) + '("--host=aarch64-unknown-linux-gnu") + '()) + (string-append "--with-ncurses=" + ncurses)))))))) (home-page "http://aa-project.sourceforge.net/aalib/") (synopsis "ASCII-art library") (description -- cgit v1.2.3 From 8d5960d1b16550d352324ac2d212141a7806fa76 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 07:59:51 +0200 Subject: gnu: liba52: Use INVOKE. * gnu/packages/video.scm (liba52)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5f045279a6..0a5f0b438a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -215,7 +215,8 @@ (define-public liba52 ;; system fixes above. (add-after 'unpack 'bootstrap - (lambda _ (zero? (system* "sh" "bootstrap"))))))) + (lambda _ + (invoke "sh" "bootstrap")))))) (home-page "http://liba52.sourceforge.net/") (synopsis "ATSC A/52 stream decoder") (description "liba52 is a library for decoding ATSC A/52 streams. The -- cgit v1.2.3 From 6c4d1413f2f800ac277ada50e9c1c657b3ed4bfb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 1 Apr 2018 08:02:28 +0200 Subject: gnu: mkvtoolnix: Use INVOKE. * gnu/packages/video.scm (mkvtoolnix)[arguments]: Substitute INVOKE for SYSTEM*. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 0a5f0b438a..4dd3e5a1ee 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -368,13 +368,13 @@ (define-public mkvtoolnix (replace 'build (lambda _ (let ((-j (list "-j" (number->string (parallel-job-count))))) - (zero? (apply system* "rake" -j))))) + (apply invoke "rake" -j)))) (replace 'check (lambda _ - (zero? (system* "rake" "tests/unit")))) + (invoke "rake" "tests/unit"))) (replace 'install (lambda _ - (zero? (system* "rake" "install"))))))) + (invoke "rake" "install")))))) (home-page "https://mkvtoolnix.download") (synopsis "Tools to create, alter and inspect Matroska files") (description -- cgit v1.2.3 From 4ef1d9fd8b3567a895e938118389ed63893c3260 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 31 May 2018 02:30:21 +0200 Subject: gnu: stunnel: Update to 5.46. * gnu/packages/web.scm (stunnel): Update to 5.46. --- gnu/packages/web.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 549db3ff9c..1d47aae09f 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4903,7 +4903,7 @@ (define-public httptunnel (define-public stunnel (package (name "stunnel") - (version "5.45") + (version "5.46") (source (origin (method url-fetch) @@ -4911,7 +4911,7 @@ (define-public stunnel version ".tar.gz")) (sha256 (base32 - "1qrfb418skdcm7b3v30ixng1ng907f4rfv54zvgz8jwakf1l90jl")))) + "1iw4gap9ysag8iww2ik029scmdllk7jdzcpnnbj7hgbl526b9akn")))) (build-system gnu-build-system) (inputs `(("openssl" ,openssl))) (arguments -- cgit v1.2.3 From 42d93a32eee444b01bfb018780f09e36f9dc54fc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 31 May 2018 02:40:45 +0200 Subject: gnu: sakura: Update to 3.6.0. * gnu/packages/terminals.scm (sakura): Update to 3.6.0. --- gnu/packages/terminals.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index e8b0357206..9ee270d875 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -617,7 +617,7 @@ (define-public cool-retro-term (define-public sakura (package (name "sakura") - (version "3.5.0") + (version "3.6.0") (source (origin (method url-fetch) (uri (string-append "https://launchpad.net/" name "/trunk/" @@ -625,14 +625,13 @@ (define-public sakura ".tar.bz2")) (sha256 (base32 - "0fhcn3540iw22l5zg3njh5z8cj0g2n9p6fvagjqa5zc323jfsc7b")))) + "1q463qm41ym7jb3kbzjz7b6x549vmgkb70arpkhsf86yxly1y5m1")))) (build-system cmake-build-system) (arguments - ;; no check phase - '(#:tests? #f)) + '(#:tests? #f)) ; no check phase (native-inputs `(("gettext" ,gettext-minimal) - ("perl" ,perl) ; for pod2man + ("perl" ,perl) ; for pod2man ("pkg-config" ,pkg-config))) (inputs `(("libxft" ,libxft) -- cgit v1.2.3 From 51c4fb007a0915834639921b2a6f344eabd54eb2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 31 May 2018 04:18:01 +0200 Subject: gnu: duperemove: Update to 0.11. * gnu/packages/disk.scm (duperemove): Update to 0.11. --- gnu/packages/disk.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index d7bf726830..f5776ebda8 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -464,15 +464,15 @@ (define-public python2-parted (define-public duperemove (package (name "duperemove") - (version "v0.11.beta4") + (version "0.11") (source (origin (method url-fetch) (uri (string-append - "https://github.com/markfasheh/duperemove/archive/" + "https://github.com/markfasheh/duperemove/archive/v" version ".tar.gz")) (sha256 (base32 - "1h5nk03kflfnzihvn2rvfz1h623x1zpkn9hp29skd7n3f2bc5k7x")) + "0rjmmh42yqw9a5j6sp31cqwxk3s97dsi4xz0wpxpllj7bsp3aiw5")) (file-name (string-append name "-" version ".tar.gz")))) (build-system gnu-build-system) (native-inputs @@ -481,11 +481,10 @@ (define-public duperemove `(("glib" ,glib) ("sqlite" ,sqlite))) (arguments - `(#:tests? #f ;no test suite + `(#:tests? #f ; no test suite #:phases (modify-phases %standard-phases - ;; no configure script - (delete 'configure)) + (delete 'configure)) ; no configure script #:make-flags (list (string-append "PREFIX=" %output) "CC=gcc"))) (home-page "https://github.com/markfasheh/duperemove") -- cgit v1.2.3 From e9ae84666702b7166a070bde197e4631dfe78f14 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 31 May 2018 04:18:45 +0200 Subject: gnu: knot: Update to 2.6.7. * gnu/packages/dns.scm (knot): Update to 2.6.7. --- gnu/packages/dns.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index 5e0cd34fdd..e5a1fc0bf8 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -490,14 +490,14 @@ (define-public yadifa (define-public knot (package (name "knot") - (version "2.6.6") + (version "2.6.7") (source (origin (method url-fetch) (uri (string-append "https://secure.nic.cz/files/knot-dns/" name "-" version ".tar.xz")) (sha256 (base32 - "02h8qdkja4kic3br79svws6r2pq1ijz945238v99d998d2jxh6ci")) + "0hr2m664ckjicv3pq2lk16m61pscknywxv2ydnrzfqf10m5h0ahw")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 706d6190cabead6885d16cb2d89cd89f1a216229 Mon Sep 17 00:00:00 2001 From: Jonathan Brielmaier Date: Sun, 27 May 2018 22:49:50 +0200 Subject: gnu: 0ad: Update to 0.0.23-alpha. * gnu/packages/games.scm (0ad-data, 0ad): Update to 0.0.23-alpha. [source]: Use HTTPS URL. [inputs]: Add libsodium. Signed-off-by: Leo Famulari --- gnu/packages/games.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'gnu/packages') diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3e848369b7..9408925514 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -67,6 +67,7 @@ (define-module (gnu packages games) #:use-module (gnu packages audio) #:use-module (gnu packages avahi) #:use-module (gnu packages boost) + #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) #:use-module (gnu packages docbook) #:use-module (gnu packages fltk) @@ -4047,16 +4048,16 @@ (define-public lugaru (define-public 0ad-data (package (name "0ad-data") - (version "0.0.22-alpha") + (version "0.0.23-alpha") (source (origin (method url-fetch) - (uri (string-append "http://releases.wildfiregames.com/0ad-" + (uri (string-append "https://releases.wildfiregames.com/0ad-" version "-unix-data.tar.xz")) (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "0vknk9ay9h2p34r7mym2g066f3s3c5d5vmap0ckcs5b86h5cscjc")) + "1b6qcvd8yyyxavgdwpcs7asmln3xgnvjkglz6ggvwb956x37ggzx")) (modules '((guix build utils))) (snippet #~(begin @@ -4101,19 +4102,18 @@ (define-public 0ad-data (define-public 0ad (package (name "0ad") - (version "0.0.22-alpha") + (version "0.0.23-alpha") (source (origin (method url-fetch) - (uri (string-append "http://releases.wildfiregames.com/0ad-" + (uri (string-append "https://releases.wildfiregames.com/0ad-" version "-unix-build.tar.xz")) (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "1cgmr4g5g9wv36v7ylbrvqhsjwgcsdgbqwc8zlqmnayk9zgkdpgx")) + "0qz1sg4n5y766qwgi63drrrx6k17kk0rcnn9a4a9crllk2vf78fg")))) ;; A snippet here would cause a build failure because of timestamps ;; reset. See https://bugs.gnu.org/26734. - )) (inputs `(("0ad-data" ,0ad-data) ("curl" ,curl) @@ -4121,6 +4121,7 @@ (define-public 0ad ("gloox" ,gloox) ("icu4c" ,icu4c) ("libpng" ,libpng) + ("libsodium" ,libsodium) ("libvorbis" ,libvorbis) ("libxcursor" ,libxcursor) ("libxml2" ,libxml2) -- cgit v1.2.3 From 88a3465e4a467be92729fc37d8bda0155bbf5c52 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Thu, 31 May 2018 00:17:55 -0400 Subject: gnu: linux-libre: Revert bad upstream patch in 4.14/4.9/4.4 kernels. Apply the 1-line revert from upstream that was the sole fix in 4.14.47, 4.9.105, and 4.4.135. Here we cherry-pick the patch until the corresponding linux-libre versions are released. * gnu/packages/linux.scm (linux-libre-4.14, linux-libre-4.9) (linux-libre-arm-generic-4.14, linux-libre-arm-omap2plus-4.14) (linux-libre-4.4): Add the patch. --- gnu/packages/linux.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu/packages') diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 72a25d5f30..98e92a62f8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -411,18 +411,45 @@ (define-public linux-libre-4.14 (make-linux-libre %linux-libre-4.14-version %linux-libre-4.14-hash '("x86_64-linux" "i686-linux" "armhf-linux") + #:patches + (list %boot-logo-patch + (origin + ;; The sole fix in the 4.14.47 release. + (method url-fetch) + (uri "https://git.kernel.org/pub/scm/linux/kernel/\ +git/stable/linux-stable.git/patch/?id=3e496be2038a100fc53627238fe120dc4c948719") + (sha256 + (base32 "1hk1qd6v97zf8an3zww60zhsah1wwax22b3bpdzmfjhhbndyram9")))) #:configuration-file kernel-config)) (define-public linux-libre-4.9 (make-linux-libre "4.9.104" "0b6y24vfsjhiv7qq7xqx7h9krc81c49dqh0189nm1lhfwciyir57" %intel-compatible-systems + #:patches + (list %boot-logo-patch + (origin + ;; The sole fix in the 4.9.105 release. + (method url-fetch) + (uri "https://git.kernel.org/pub/scm/linux/kernel/\ +git/stable/linux-stable.git/patch/?id=98d69fb3b175855cdd4c37d41a4b477a0860b1a0") + (sha256 + (base32 "1r52fr0w94fgw7nfxrysjk0mljlnqwqsnl0cp84c1sly466i79dv")))) #:configuration-file kernel-config)) (define-public linux-libre-4.4 (make-linux-libre "4.4.134" "137mklzyv56yhc48l5h5i0h01gm1q40x2a8nk51lwhbjv592xr8x" %intel-compatible-systems + #:patches + (list %boot-logo-patch + (origin + ;; The sole fix in the 4.4.135 release. + (method url-fetch) + (uri "https://git.kernel.org/pub/scm/linux/kernel/\ +git/stable/linux-stable.git/patch/?id=393e9b3c30d571c2f655aa24b0dee5be9ce249b5") + (sha256 + (base32 "02wk036v525qwqs42ndqqj4mv8xfkpavibfg5ns6hkg2wc5a1jid")))) #:configuration-file kernel-config)) (define-public linux-libre-4.1 @@ -443,6 +470,15 @@ (define-public linux-libre-arm-generic-4.14 %linux-libre-4.14-hash '("armhf-linux") #:defconfig "multi_v7_defconfig" + #:patches + (list %boot-logo-patch + (origin + ;; The sole fix in the 4.14.47 release. + (method url-fetch) + (uri "https://git.kernel.org/pub/scm/linux/kernel/\ +git/stable/linux-stable.git/patch/?id=3e496be2038a100fc53627238fe120dc4c948719") + (sha256 + (base32 "1hk1qd6v97zf8an3zww60zhsah1wwax22b3bpdzmfjhhbndyram9")))) #:extra-version "arm-generic")) (define-public linux-libre-arm-omap2plus @@ -457,6 +493,15 @@ (define-public linux-libre-arm-omap2plus-4.14 %linux-libre-4.14-hash '("armhf-linux") #:defconfig "omap2plus_defconfig" + #:patches + (list %boot-logo-patch + (origin + ;; The sole fix in the 4.14.47 release. + (method url-fetch) + (uri "https://git.kernel.org/pub/scm/linux/kernel/\ +git/stable/linux-stable.git/patch/?id=3e496be2038a100fc53627238fe120dc4c948719") + (sha256 + (base32 "1hk1qd6v97zf8an3zww60zhsah1wwax22b3bpdzmfjhhbndyram9")))) #:extra-version "arm-omap2plus")) -- cgit v1.2.3