GNU bug report logs - #44821
[PATCH] gnu: Add diff-so-fancy.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Leo Famulari <leo <at> famulari.name>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#44821: closed ([PATCH] gnu: Add diff-so-fancy.)
Date: Sat, 05 Dec 2020 17:58:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Sat, 5 Dec 2020 12:56:56 -0500
with message-id <X8vJ6E85QxSPkzc8 <at> jasmine.lan>
and subject line Re: [PATCH v4] gnu: Add diff-so-fancy.
has caused the debbugs.gnu.org bug report #44821,
regarding [PATCH] gnu: Add diff-so-fancy.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
44821: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=44821
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: EuAndreh <eu <at> euandre.org>
To: guix-patches <at> gnu.org
Cc: EuAndreh <eu <at> euandre.org>
Subject: [PATCH] gnu: Add diff-so-fancy.
Date: Mon, 23 Nov 2020 14:14:22 -0300

* gnu/packages/version-control.scm (diff-so-fancy): New variable.
---
 gnu/packages/version-control.scm | 40 ++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 1842528ff6..7d64b6440c 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,45 @@ 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)))
+    (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

[Message part 3 (message/rfc822, inline)]

From: Leo Famulari <leo <at> famulari.name>
To: EuAndreh <eu <at> euandre.org>
Cc: 44821-done <at> debbugs.gnu.org
Subject: Re: [PATCH v4] gnu: Add diff-so-fancy.
Date: Sat, 5 Dec 2020 12:56:56 -0500

On Sat, Dec 05, 2020 at 08:55:42AM -0300, EuAndreh wrote:
> From: Leo Famulari <leo <at> famulari.name>
> 
> * gnu/packages/version-control.scm (diff-so-fancy): New variable.
> ---
> Thanks for the revised patch. The only thing missing was the proper
> escaping of the substituted path:
>   (string-append "use lib '" lib "';\n")))
> 
> The lib path had to be between quotes, with a final semicolon.
> 
> I've taken yours and only fixed this part. I've tested it, and it works.

Great! Pushed as 32a3367930844b242b57ea634c2de43e4ea3b57b

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.