From patchwork Wed Feb 13 23:58:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 1087 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D296616C23; Wed, 13 Feb 2019 23:59:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 6DD9316C1F for ; Wed, 13 Feb 2019 23:59:12 +0000 (GMT) Received: from localhost ([127.0.0.1]:36951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gu4Qq-0007Rs-2x for patchwork@mira.cbaines.net; Wed, 13 Feb 2019 18:59:12 -0500 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-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Wed, 13 Feb 2019 23:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 34449 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vagrant Cascadian Mail-Followup-To: 34449@debbugs.gnu.org, leo@famulari.name, vagrant@reproducible-builds.org Received: via spool by 34449-done@debbugs.gnu.org id=D34449.15501023047531 (code D ref 34449); Wed, 13 Feb 2019 23:59:01 +0000 Received: (at 34449-done) by debbugs.gnu.org; 13 Feb 2019 23:58:24 +0000 Received: from localhost ([127.0.0.1]:47484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu4Py-0001xI-6H for submit@debbugs.gnu.org; Wed, 13 Feb 2019 18:58:24 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:44941) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gu4Pu-0001x4-Rf for 34449-done@debbugs.gnu.org; Wed, 13 Feb 2019 18:58:16 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 7D52C1506; Wed, 13 Feb 2019 18:58:08 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Wed, 13 Feb 2019 18:58:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=mesmtp; bh=nhgPzo2ZVBobRGiTiL6/E3WQ KQIe61OZJOyVgAZcgcI=; b=BdT+RVJMDRWxVnkQGUO6XMN5MGfDUMBJC9OUGzEQ aJ2Z3Fpl4Ksa2FlMzA6OYKcrYQ6WYLTvTN9vzLDdi14v0P5cGdkBd/Cp/Nk6bzba bdOqBA6cJjAoyD+RJQEhutG4dfufXGICBTDko5QhGdBsQim4MGxnCoGUP6EVeyog cng= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=nhgPzo 2ZVBobRGiTiL6/E3WQKQIe61OZJOyVgAZcgcI=; b=RQJGtqtDlReCdCcEConjNR g1LRsXzrkwev7hMZasbSNw7iIOL0j/9qD+4gmA6lTVPAzVxTKv5zo3D/ogBwMAPZ OfULyMPJqY/0N6aaX1xGaw+20No4fDZ5jn4wQpSagzHOOyBgnpxgLsmZ9LNh8xOp xsHr8jdWuttSoJ4ECzZD1NxYvxKjhBIWukONnG9IA+uxp9qMKRwx795ENhDgshXq ts5gIk2TzsoabgDp3qmyMhEKmQFC1MPNdp89LmIVFFDijDs6pSLZyqmVgC2qiSyC OxsgFOoCy3fzeN5fX+dDYNGs0hwFzzuRXBVWpZSHux2kfB7qIP6ZXxQTANuXOgTg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtledruddtgedgudehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfquhhtnecuuegrihhlohhuthemucef tddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpeffhffvuffkfh ggtggujggfsehgtderredtredunecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehl vghosehfrghmuhhlrghrihdrnhgrmhgvqeenucffohhmrghinhepughifhhfohhstghoph gvrdhorhhgnecukfhppeejiedruddvgedrvddtvddrudefjeenucfrrghrrghmpehmrghi lhhfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvgenucevlhhushhtvghrufhiii gvpedt X-ME-Proxy: Received: from localhost (c-76-124-202-137.hsd1.pa.comcast.net [76.124.202.137]) by mail.messagingengine.com (Postfix) with ESMTPA id 1CBF71026E; Wed, 13 Feb 2019 18:58:07 -0500 (EST) 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-Disposition: inline In-Reply-To: <87lg2j5pqm.fsf@ponder> User-Agent: Mutt/1.11.2 (2019-01-07) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 34449-done@debbugs.gnu.org Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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-management.scm index 51d6698ee0..eff8d5c3fd 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2018 Sou Bunnbu ;;; Copyright © 2018 Eric Bavier ;;; Copyright © 2019 Efraim Flashner +;;; Copyright © 2019 Vagrant Cascadian ;;; ;;; This file is part of GNU Guix. ;;; @@ -625,24 +626,25 @@ compare two tarballs, ISO images, or PDFs just as easily.") (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") "/share/"))) (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}. 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 to compare them. It can compare two tarballs, ISO images, or PDFs just as easily. Results are displayed by default, stored as local text or html files, or made -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 on the server are purged after 30 days.") (license license:gpl3+)))