From patchwork Sat Dec 5 05:14:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 25582 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 3B14A27BBFE; Sat, 5 Dec 2020 05:15:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 515AB27BBFD for ; Sat, 5 Dec 2020 05:15:17 +0000 (GMT) Received: from localhost ([::1]:34442 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1klPue-0003ud-A4 for patchwork@mira.cbaines.net; Sat, 05 Dec 2020 00:15:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60766) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klPuR-0003uQ-8u for guix-patches@gnu.org; Sat, 05 Dec 2020 00:15:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34850) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klPuQ-0007MU-H1 for guix-patches@gnu.org; Sat, 05 Dec 2020 00:15:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1klPuP-00084w-T2 for guix-patches@gnu.org; Sat, 05 Dec 2020 00:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44821] [PATCH v3] gnu: Add diff-so-fancy. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Dec 2020 05:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44821 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: EuAndreh Cc: 44821@debbugs.gnu.org Received: via spool by 44821-submit@debbugs.gnu.org id=B44821.160714528631018 (code B ref 44821); Sat, 05 Dec 2020 05:15:01 +0000 Received: (at 44821) by debbugs.gnu.org; 5 Dec 2020 05:14:46 +0000 Received: from localhost ([127.0.0.1]:46396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klPuA-00084E-6x for submit@debbugs.gnu.org; Sat, 05 Dec 2020 00:14:46 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:48077) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klPu7-000840-86 for 44821@debbugs.gnu.org; Sat, 05 Dec 2020 00:14:44 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 10BCD5C009B; Sat, 5 Dec 2020 00:14:38 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 05 Dec 2020 00:14:38 -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=91ZArgEF8WNJBE/MTkq3o2yJ dl6Ij9wkDh2hSGWG4fg=; b=IgHzeIHbA6rO1Wz7MQ/8sJOHMshXLK9DyFeBXtkE uI4xQp5CplgI3FbHcO9mZUJfZYZ6OXHsYj0lbyZ1Ekf62EbbxtjcDQ3W4N6Zn3z2 QRvNg8NxPqwKQYfe2gpGNPyNtDzLdDVsb8h3pGiqVGI5EGnbJwLJsB8bneKg7Wxh jMw= 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=fm1; bh=91ZArg EF8WNJBE/MTkq3o2yJdl6Ij9wkDh2hSGWG4fg=; b=h8AqjQH8BghZnwj8d/JrrR mLL2xPBnSVS1HBP5bcBkE45oPh2Jqhh7E8ZWqnEkvzpA0+p1psp1eobjfLF5gQMu iTkVF2cKqf2hsYWVPTQ959GsgP+5B6E3+5L4yBA2HMW8hXe6bbvMlk+konjtvjlM 4XwIcCv1PqEgT72Jg2DVPCK3Au6MLbW29Tpe/CfufFABrjW9AW2CP/c/h8hpne9o 61rIzgL4sGFOzv8qGrruHDQ0pWXBDC8rJ8RLO3yIdpxreC3ALCzKaTMHDgdMDW/k jenGsCGpCiZvVwlVwIfRBWPNp49G0B+q/O8qAzQ70DRlbitqwRYlcsVii3FAVsdQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudeiledgjeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggujgesmhdtre ertddtvdenucfhrhhomhepnfgvohcuhfgrmhhulhgrrhhiuceolhgvohesfhgrmhhulhgr rhhirdhnrghmvgeqnecuggftrfgrthhtvghrnheptdegueeiheelheffjeetieehffelfe ektdefuedtjeeufeegjeekfedtheevkefhnecukfhppeejfedrudeguddruddvjedrudeg ieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvg hosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: from localhost (c-73-141-127-146.hsd1.pa.comcast.net [73.141.127.146]) by mail.messagingengine.com (Postfix) with ESMTPA id 8D072108005F; Sat, 5 Dec 2020 00:14:37 -0500 (EST) Date: Sat, 5 Dec 2020 00:14:35 -0500 From: Leo Famulari Message-ID: References: <871rg5o26c.fsf@euandre.org> <20201204200827.31337-1-eu@euandre.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201204200827.31337-1-eu@euandre.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches On Fri, Dec 04, 2020 at 05:08:27PM -0300, EuAndreh wrote: > * gnu/packages/version-control.scm (diff-so-fancy): New variable. > --- > Fixed the unnecessary propagated input as suggested. Thanks! > + (arguments > + '(#:phases > + (modify-phases %standard-phases > + (add-after 'install 'symlink-executable > + (lambda* (#:key outputs inputs #:allow-other-keys) > + (let ((out (assoc-ref outputs "out")) > + (ncurses (assoc-ref inputs "ncurses")) > + (perl (assoc-ref inputs "perl"))) > + (mkdir (string-append out "/bin")) > + ;; diff-so-fancy looks for lib/ under the directory > + ;; it is in I should have noticed it sooner but I think it's better to adjust how diff-so-fancy finds the library than to work around this unusual expectation. I attached a revised patch that does this. Can you test if it works for you? It simplifies the symlink-executable phase, adds a patch-lib-path phase, and adjusts the install-plan accordingly. If it works then we should be done! From e2aa936812873408292c7c23e160cd5390e90a60 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 4 Dec 2020 23:45:28 -0500 Subject: [PATCH] gnu: Add diff-so-fancy. * gnu/packages/version-control.scm (diff-so-fancy): New variable. Signed-off-by: Leo Famulari --- gnu/packages/version-control.scm | 47 ++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index eec57b3b6d..da04fdcb93 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2812,6 +2812,53 @@ for historians.") (home-page "https://www.gnu.org/software/gnu-arch/") (license license:gpl2))) ;version 2 only +(define-public diff-so-fancy + (package + (name "diff-so-fancy") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/so-fancy/diff-so-fancy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl")))) + (inputs + `(("perl" ,perl) + ("ncurses" ,ncurses))) + (build-system copy-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-lib-path + (lambda* (#:key outputs #:allow-other-keys) + (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) + (substitute* "diff-so-fancy" + (("use lib.*$") + (string-append "use lib " lib "\n"))) + #t))) + (add-after 'install 'symlink-executable + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ncurses (assoc-ref inputs "ncurses")) + (perl (assoc-ref inputs "perl"))) + (wrap-program (string-append out "/bin/diff-so-fancy") + `("PATH" ":" prefix (,(string-append ncurses "/bin") + ,(string-append perl "/bin")))) + #t)))) + #:install-plan + '(("lib" "lib") + ("diff-so-fancy" "bin/")))) + (home-page "https://github.com/so-fancy/diff-so-fancy") + (synopsis "Makes diffs more human friendly and readable") + (description + "@code{diff-so-fancy} strives to make your diffs human readable instead +of machine readable. This helps improve code quality and helps you spot +defects faster.") + (license license:expat))) + (define-public go-github-go-git (package (name "go-github-go-git")