From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:51990) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu4Qk-0007R6-7R for guix-patches@gnu.org; Wed, 13 Feb 2019 18:59:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gu4Qi-0002uu-84 for guix-patches@gnu.org; Wed, 13 Feb 2019 18:59:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48205) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gu4Qg-0002sx-BB for guix-patches@gnu.org; Wed, 13 Feb 2019 18:59:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gu4Qg-0001yM-7O for guix-patches@gnu.org; Wed, 13 Feb 2019 18:59:02 -0500 Subject: bug#34449: [PATCH] gnu: Add trydiffoscope. Resent-To: guix-patches@gnu.org Resent-Message-ID: Date: Wed, 13 Feb 2019 18:58:05 -0500 From: Leo Famulari Message-ID: <20190213235805.GA24134@jasmine.lan> References: <87wom53gij.fsf@ponder> <70476863-38DA-4DA0-BBA9-82B20B2AB197@lepiller.eu> <87r2cda0b9.fsf@ponder> <20190212203742.GA31872@jasmine.lan> <87lg2j5pqm.fsf@ponder> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="YZ5djTAD1cGYuMQK" Content-Disposition: inline In-Reply-To: <87lg2j5pqm.fsf@ponder> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Vagrant Cascadian Cc: 34449-done@debbugs.gnu.org --YZ5djTAD1cGYuMQK Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 13, 2019 at 01:43:13PM -0800, Vagrant Cascadian wrote: > I couldn't really think of a straightforward way to mention the > diffoscope package, but the attached patch updates the synopsis and > description to address the other mentioned issues. Okay, sometimes these non-code parts are actually the hardest! :) I pushed as commit 706460a35754a47bf832a40de4f22271e7088226 with the changes below. I found that the software didn't work without the requests module, and that the man page was being installed to a location that is not idiomatic for Guix. `trydiffoscope --webbrowser foo bar` is super nice! diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-man= agement.scm index 51d6698ee0..eff8d5c3fd 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -10,6 +10,7 @@ ;;; Copyright =A9 2018 Sou Bunnbu ;;; Copyright =A9 2018 Eric Bavier ;;; Copyright =A9 2019 Efraim Flashner +;;; Copyright =A9 2019 Vagrant Cascadian ;;; ;;; This file is part of GNU Guix. ;;; @@ -625,24 +626,25 @@ compare two tarballs, ISO images, or PDFs just as eas= ily.") (modify-phases %standard-phases (add-after 'install 'install-doc (lambda* (#:key outputs #:allow-other-keys) - (let* ((share (string-append (assoc-ref outputs "out") "/usr/= share/"))) + (let* ((share (string-append (assoc-ref outputs "out") "/shar= e/"))) (mkdir-p (string-append share "/man/man1/" )) (invoke "rst2man.py" "trydiffoscope.1.rst" (string-append share "/man/man1/trydiffoscope.1")) (mkdir-p (string-append share "/doc/" ,name "-" ,version)) (install-file "./README.rst" - (string-append share "/doc/" ,name "-" ,version)= ))))))) + (string-append share "/doc/" ,name "-" ,version)= )) + #t))))) + (propagated-inputs + `(("python-requests" ,python-requests))) (native-inputs `(("gzip" ,gzip) ("python-docutils" ,python-docutils))) (build-system python-build-system) (home-page "https://try.diffoscope.org") - (synopsis "Client for remote service to compare files and archives in = depth") - (description - "This is a client for the remote diffoscope service located at: - -https://try.diffoscope.org + (synopsis "Client for remote diffoscope service") + (description "This is a client for the @url{https://try.diffoscope.org, +remote diffoscope service}. =20 Diffoscope tries to get to the bottom of what makes files or directories different. It recursively unpacks archives of many kinds and transforms @@ -650,7 +652,7 @@ various binary formats into more human readable forms t= o compare them. It can compare two tarballs, ISO images, or PDFs just as easily. =20 Results are displayed by default, stored as local text or html files, or m= ade -available via a URL on https://try.diffoscope.org. Results stored on the +available via a URL on @url{https://try.diffoscope.org}. Results stored o= n the server are purged after 30 days.") (license license:gpl3+))) =20 --YZ5djTAD1cGYuMQK Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAlxkrw0ACgkQJkb6MLrK fwhNCxAAicgeen5EEpRUMoJ8GvtpVwMCSOetxyn8CjCHzBJb8JMqmCkz/UHKicUI 95tF2NcYqzmzXr1zdSvg2NQM5/fyeIezy4719IGSWHbFHdaozH+0IltTDCBlQlhy chJnNzNHvdgXVJ35XQigbJAHeD8YebMKKFuuiz/5ExotjuaH2opV8HvamH/yUXpc 0czND6+cwgst1blYqT6Qmug55QMPexpIG21D8bqTKe62UnnxQILKhnzjF9uSz4/F Z6CILOsZ5Fv0lVbOXNvwekdfhHhGW0ll3Y59iuGM1+HyvECA9wfbsB7NkSpKnvO/ NGejxXirZeSK31J7l03xGiMj+T6TJt5WGxEAJDyaSiXxZBHPhx6oVkpDBNLsU+og VREUYS62ZDITAqkm5SXRTRFQEygI5fIcdCXUZ7orf2qQG9ODwFxE1m+7LrP8+tVd 7nS7NxCSU/IT8vmggq8HNFUQDjjvK8dDtG1RgM6TYtpiAt2AsV+0Z2EmAWv8IfJW UoaCbD4yK0UKZvGIy1gZKUiRVqT9jUsujGG/ho1u9FKBeqFQMf3WKeXXp1EU+ZwL mkF7Wt8sR9EhtZeY5HSv1VoCvI8BLrpzUVM1wvGndB4gjHHP7Z//yszo01O+q7NA GS14rOWvtkR111tgwe6iMvKj1rwz361Rx0Byf424d92ur6txEkU= =ZVO1 -----END PGP SIGNATURE----- --YZ5djTAD1cGYuMQK--