From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QKIQEgEHvF8WGAAA0tVLHw (envelope-from ) for ; Mon, 23 Nov 2020 19:01:21 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +P7cDQEHvF/BdAAAbx9fmQ (envelope-from ) for ; Mon, 23 Nov 2020 19:01:21 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E6A43940341 for ; Mon, 23 Nov 2020 19:01:20 +0000 (UTC) Received: from localhost ([::1]:35288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khH5T-0001jE-Gq for larch@yhetil.org; Mon, 23 Nov 2020 14:01:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khH5J-0001h7-Cf for guix-patches@gnu.org; Mon, 23 Nov 2020 14:01:11 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39625) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1khH5C-00081k-Ks for guix-patches@gnu.org; Mon, 23 Nov 2020 14:01:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1khH5C-00036u-IZ for guix-patches@gnu.org; Mon, 23 Nov 2020 14:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44821] [PATCH v2] gnu: Add diff-so-fancy. References: <20201123171422.10683-1-eu@euandre.org> In-Reply-To: <20201123171422.10683-1-eu@euandre.org> Resent-From: EuAndreh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Nov 2020 19:01:02 +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: 44821@debbugs.gnu.org Cc: EuAndreh Received: via spool by 44821-submit@debbugs.gnu.org id=B44821.160615800411793 (code B ref 44821); Mon, 23 Nov 2020 19:01:02 +0000 Received: (at 44821) by debbugs.gnu.org; 23 Nov 2020 19:00:04 +0000 Received: from localhost ([127.0.0.1]:51167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1khH4G-000349-4T for submit@debbugs.gnu.org; Mon, 23 Nov 2020 14:00:04 -0500 Received: from box.euandre.org ([46.101.160.115]:60355) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1khH4D-000335-2h for 44821@debbugs.gnu.org; Mon, 23 Nov 2020 14:00:02 -0500 Received: from authenticated-user (box.euandre.org [46.101.160.115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by box.euandre.org (Postfix) with ESMTPSA id 9A37BFC3D2; Mon, 23 Nov 2020 15:59:53 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1606157994; bh=CpAxOac0Bx9LV/7GeyKqxC5WWendpvl0rdZLkQVJN2g=; h=From:To:Cc:Subject:Date:From; b=r2SwhN7pqmwOMr5IuDXX4kAFajQhYs/ZhcGGcLPs2CErzMSnOemEdkXqDj/e1tEyS UCTUN646WvSwFIw/C7cFDAfYHX/lGqi01K5TdisiwpFUJhnHsLQHJYK29tMpJ29T7H CH1cHm7tmDc4zb7bFmeYugFrSXh7CKFjm4TAHMNiCSSyT51/CcJnfRkkr3xWEuvQfF 5BKY3NfYgUFjDs7YxuQrBQpUeIpqpiqkEoCwbkICcgBy8huTqmeafV7xOzDqSohz7k +VHZlIaC6oBQZlr3xqnmAmehW2tnUwd1WvG6/T/mzWm+McAiFFpabhE7Q3G4Shbjig TmNnqZRQ20e+g== Date: Mon, 23 Nov 2020 15:59:50 -0300 Message-Id: <20201123185950.20574-1-eu@euandre.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: EuAndreh , EuAndreh via Guix-patches From: EuAndreh via Guix-patches via X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=euandre.org header.s=mail header.b=r2SwhN7p; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 2.49 X-TUID: DzNureSTQflD * gnu/packages/version-control.scm (diff-so-fancy): New variable. --- Differs from previous patch by having ncurses as a propagated input. gnu/packages/version-control.scm | 42 ++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 1842528ff6..708f24437d 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -55,6 +55,7 @@ #:use-module (guix git-download) #:use-module (guix hg-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) @@ -2775,6 +2776,47 @@ 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))) + (propagated-inputs + `(("ncurses" ,ncurses))) + (build-system copy-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'symlink-executable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir (string-append out "/bin")) + ;; diff-so-fancy looks for lib/ under the directory + ;; it is in + (symlink (string-append out "/diff-so-fancy") + (string-append out "/bin/diff-so-fancy")) + #t)))) + #:install-plan + '(("lib" "lib") + ("diff-so-fancy" "diff-so-fancy")))) + (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") -- 2.29.2