diff options
Diffstat (limited to 'gnu/packages/bittorrent.scm')
-rw-r--r-- | gnu/packages/bittorrent.scm | 57 |
1 files changed, 37 insertions, 20 deletions
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 4a84fbf8f5..eac66713ea 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2014 Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com> ;;; Copyright © 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Leo Famulari <leo@famulari.name> -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org> @@ -13,6 +13,7 @@ ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2021 Justin Veilleux <terramorpha@cock.li> ;;; Copyright © 2021 Marius Bakke <marius@gnu.org> +;;; Copyright © 2021 Josselin Poiret <josselin.poiret@protonmail.ch> ;;; ;;; This file is part of GNU Guix. ;;; @@ -38,6 +39,7 @@ #:use-module (guix build-system python) #:use-module (guix build-system glib-or-gtk) #:use-module ((guix licenses) #:prefix l:) + #:use-module (guix gexp) #:use-module (guix utils) #:use-module (gnu packages) #:use-module (gnu packages adns) @@ -297,7 +299,7 @@ maintained upstream.") (define-public aria2 (package (name "aria2") - (version "1.35.0") + (version "1.36.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/aria2/aria2/releases/" @@ -305,23 +307,24 @@ maintained upstream.") "/aria2-" version ".tar.xz")) (sha256 (base32 - "1zbxc517d97lb96f15xcy4l7b66grxrp3h2ids2jiwkaip87yaqy")))) + "1987x4ywnnrhhfs9hi2h820c200d7nas9nd35414yh0jiihfglaq")))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list "--enable-libaria2" - (string-append "--with-bashcompletiondir=" - %output "/etc/bash_completion.d/")) + (list + #:configure-flags + #~(list "--enable-libaria2" + (string-append "--with-bashcompletiondir=" + #$output "/etc/bash_completion.d/")) #:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-socket-tests - (lambda _ - (substitute* "test/LpdMessageDispatcherTest.cc" - (("CPPUNIT_TEST_SUITE_REGISTRATION\\(LpdMessageDispatcherTest\\);" text) - (string-append "// " text))) - (substitute* "test/LpdMessageReceiverTest.cc" - (("CPPUNIT_TEST_SUITE_REGISTRATION\\(LpdMessageReceiverTest\\);" text) - (string-append "// " text))) - #t))))) + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-socket-tests + (lambda _ + (substitute* "test/LpdMessageDispatcherTest.cc" + (("CPPUNIT_TEST_SUITE_REGISTRATION\\(LpdMessageDispatcherTest\\);" text) + (string-append "// " text))) + (substitute* "test/LpdMessageReceiverTest.cc" + (("CPPUNIT_TEST_SUITE_REGISTRATION\\(LpdMessageReceiverTest\\);" text) + (string-append "// " text)))))))) (native-inputs (list cppunit ; for the tests pkg-config)) @@ -340,6 +343,8 @@ maintained upstream.") "Aria2 is a lightweight, multi-protocol & multi-source command-line download utility. It supports HTTP/HTTPS, FTP, SFTP, BitTorrent and Metalink. Aria2 can be manipulated via built-in JSON-RPC and XML-RPC interfaces.") + (properties + '((release-monitoring-url . "https://github.com/aria2/aria2/releases"))) (license l:gpl2+))) (define-public uget @@ -529,7 +534,6 @@ features.") (build-system python-build-system) (propagated-inputs `(("gtk+" ,gtk+) - ("librsvg" ,librsvg) ("libtorrent" ,libtorrent-rasterbar) ("python-pycairo" ,python-pycairo) ("python-chardet" ,python-chardet) @@ -546,7 +550,10 @@ features.") ("python-twisted" ,python-twisted) ("python-zope-interface" ,python-zope-interface))) (native-inputs - (list intltool python-wheel)) + (list intltool python-wheel + (if (string-prefix? "x86_64-" (%current-system)) + librsvg-bootstrap + librsvg-2.40))) ;; TODO: Enable tests. ;; After "pytest-twisted" is packaged, HOME is set, and an X server is ;; started, some of the tests still fail. There are likely some tests @@ -563,9 +570,19 @@ features.") (("names='ngettext'") "names=['ngettext']")) #t)) (add-after 'install 'wrap - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key native-inputs inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (gi-typelib-path + (string-join (filter + (lambda (x) (not (string-prefix? + (assoc-ref + (or native-inputs inputs) + "librsvg") + x))) + (string-split + (getenv "GI_TYPELIB_PATH") + #\:)) + ":"))) (for-each (lambda (program) (wrap-program program |