From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0HYfF/Omyl+JDgAA0tVLHw (envelope-from ) for ; Fri, 04 Dec 2020 21:15:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id EI7lEvOmyl9QZQAAB5/wlQ (envelope-from ) for ; Fri, 04 Dec 2020 21:15:31 +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 DDC079404FE for ; Fri, 4 Dec 2020 21:15:30 +0000 (UTC) Received: from localhost ([::1]:52398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1klIQL-0003eM-Tf for larch@yhetil.org; Fri, 04 Dec 2020 16:15:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57032) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1klHO2-0005DT-HN for guix-patches@gnu.org; Fri, 04 Dec 2020 15:09:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:34401) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1klHO2-0002Fe-7F for guix-patches@gnu.org; Fri, 04 Dec 2020 15:09:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1klHO2-0003Sz-2m for guix-patches@gnu.org; Fri, 04 Dec 2020 15:09:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44821] [PATCH v3] gnu: Add diff-so-fancy. Resent-From: EuAndreh Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 04 Dec 2020 20:09: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: eu@euandre.org Cc: 44821@debbugs.gnu.org, leo@famulari.name Received: via spool by 44821-submit@debbugs.gnu.org id=B44821.160711252113298 (code B ref 44821); Fri, 04 Dec 2020 20:09:02 +0000 Received: (at 44821) by debbugs.gnu.org; 4 Dec 2020 20:08:41 +0000 Received: from localhost ([127.0.0.1]:45947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klHNg-0003SQ-Qp for submit@debbugs.gnu.org; Fri, 04 Dec 2020 15:08:41 -0500 Received: from box.euandre.org ([46.101.160.115]:37879) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1klHNe-0003SB-8K for 44821@debbugs.gnu.org; Fri, 04 Dec 2020 15:08:39 -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 C5E55101F11; Fri, 4 Dec 2020 17:08:30 -0300 (-03) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=euandre.org; s=mail; t=1607112512; bh=VuxcTeGB+KdhUITef4WIDXsgMB0SwUVYE3acbfXb5cI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XBlyCZquJQzAaOCZEVIYE+c25lD8Tt+y8s5SQB9jAvrouCKSKO59FMxT4550Xwgd8 FqyC684YeclNfMyKpDfcZ4n+EqSmQCguJOz72bc8Mef+clFvCVhjofKb8cjz/3k2y8 J8dg5FCGAK1+cis5owu1H/qS+p1LrXwdzUWO+sPxSwHHNmUSNjJVlsgDztklo7mywK ww2oUYac9KKQvSpiRpowvZnkaQY+eLqLoN5QQyGAlxMuMdkYN3sXNBz3ivmA5O6A7t 2c/EhalgkZbP/CBJw2q5BK3ygX6Jux9HcZXA7FyAB0S3r9aAYOUxV5lEbgawZjsve7 RrJAUaEuDQ2Ww== Date: Fri, 4 Dec 2020 17:08:27 -0300 Message-Id: <20201204200827.31337-1-eu@euandre.org> In-Reply-To: <871rg5o26c.fsf@euandre.org> References: <871rg5o26c.fsf@euandre.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: EuAndreh , EuAndreh via Guix-patches From: EuAndreh via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.21 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=euandre.org header.s=mail header.b=XBlyCZqu; 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-Migadu-Queue-Id: DDC079404FE X-Spam-Score: 2.21 X-Migadu-Scanner: ns3122888.ip-94-23-21.eu X-TUID: /xCIYP6EN1ix * gnu/packages/version-control.scm (diff-so-fancy): New variable. --- Fixed the unnecessary propagated input as suggested. I've also removed the copyright update, as is was already done on another patch. gnu/packages/version-control.scm | 46 ++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index a8e6d2c4b9..e8b5adef27 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) @@ -2811,6 +2812,51 @@ 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 '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 + (symlink (string-append out "/diff-so-fancy") + (string-append out "/bin/diff-so-fancy")) + (wrap-program (string-append out "/diff-so-fancy") + `("PATH" ":" prefix (,(string-append ncurses "/bin") + ,(string-append perl "/bin")))) + #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