GNU bug report logs - #71358
[PATCH 0/2] Update tig

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 71358 in the body.
You can then email your comments to 71358 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: guix-patches <at> gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 0/2] Update tig
Date: Tue,  4 Jun 2024 10:35:26 +0200

Update tig to latest version, fetch it from git and switch to new
package style.

Timotej Lazar (2):
  gnu: tig: Update to 2.5.10.
  gnu: tig: Update package style.

 gnu/packages/version-control.scm | 62 +++++++++++++++-----------------
 1 file changed, 29 insertions(+), 33 deletions(-)


base-commit: 5d3edff1a604414a3c42b89fcbc007e9d573993d
-- 
2.45.1

Message #8 received at 71358 <at> debbugs.gnu.org (full text, mbox):

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 71358 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 1/2] gnu: tig: Update to 2.5.10.
Date: Tue,  4 Jun 2024 10:50:08 +0200

* gnu/packages/version-control.scm (tig): Update to 2.5.10.
[source]: Switch to git. Drop unbundling snippet.
[native-inputs]: Add autoconf, automake, docbook-xsl, libxml2, pkg-config.

Change-Id: I1ef40cb4aef8c7e7a6a974344b45c81ee55d11c3

foo

Change-Id: I79d8239e7d0d83bfef42263718e8d2d3a2c83252
---
 gnu/packages/version-control.scm | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 4280d4fab8..f0503a8db0 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2786,23 +2786,19 @@ (define-public aegis
 (define-public tig
   (package
     (name "tig")
-    (version "2.5.8")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/jonas/tig/releases/download/tig-"
-                    version "/tig-" version ".tar.gz"))
-              (sha256
-               (base32
-                "14b38200bmwvi3030hqnwdsp34854ck3bzncj0wlljnpmr10l3mp"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  ;; TODO: Delete and rebuild doc/*.(1|5|7).
-                  (for-each delete-file (find-files "doc" "\\.html$"))))))
+    (version "2.5.10")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/jonas/tig.git")
+             (commit (string-append "tig-" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0m7v6xkvly3cbc5hs7plxdny4r41x3vkx7xylygjva4jcvnz0fjr"))))
     (build-system gnu-build-system)
     (native-inputs
-     (list asciidoc xmlto))
+     (list asciidoc autoconf automake docbook-xsl libxml2 pkg-config xmlto))
     (inputs
      (list ncurses readline))
     (arguments
-- 
2.45.1

Message #11 received at 71358 <at> debbugs.gnu.org (full text, mbox):

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 71358 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 2/2] gnu: tig: Update package style.
Date: Tue,  4 Jun 2024 10:50:09 +0200

* gnu/packages/version-control.scm (tig)[arguments]: Switch to gexps. Move
above input fields.

Change-Id: I32976ccd3f5602e847b1573695356c7e4e6dd9d7
---
 gnu/packages/version-control.scm | 36 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index f0503a8db0..d7f6f8d29e 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2797,28 +2797,28 @@ (define-public tig
        (sha256
         (base32 "0m7v6xkvly3cbc5hs7plxdny4r41x3vkx7xylygjva4jcvnz0fjr"))))
     (build-system gnu-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'install-doc
+            (lambda _
+              (invoke "make" "install-doc")))
+          (add-after 'install 'install-completions
+            (lambda _
+              (let ((share (string-append #$output "/share")))
+                (mkdir-p (string-append share "/bash-completion/completions"))
+                (mkdir-p (string-append share "/zsh/site-functions"))
+                (copy-file "contrib/tig-completion.bash"
+                           (string-append share "/bash-completion/completions/tig"))
+                (copy-file "contrib/tig-completion.zsh"
+                           (string-append share "/zsh/site-functions/_tig"))))))
+      #:test-target "test"
+      #:tests? #f))                    ; tests require access to /dev/tty
     (native-inputs
      (list asciidoc autoconf automake docbook-xsl libxml2 pkg-config xmlto))
     (inputs
      (list ncurses readline))
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'install-doc
-           (lambda _
-             (invoke "make" "install-doc")))
-         (add-after 'install 'install-completions
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out   (assoc-ref outputs "out"))
-                    (share (string-append out "/share")))
-               (mkdir-p (string-append share "/bash-completion/completions"))
-               (mkdir-p (string-append share "/zsh/site-functions"))
-               (copy-file "contrib/tig-completion.bash"
-                          (string-append share "/bash-completion/completions/tig"))
-               (copy-file "contrib/tig-completion.zsh"
-                          (string-append share "/zsh/site-functions/_tig"))))))
-       #:test-target "test"
-       #:tests? #f))                    ; tests require access to /dev/tty
     (home-page "https://jonas.github.io/tig/")
     (synopsis "Ncurses-based text user interface for Git")
     (description
-- 
2.45.1

Message #16 received at 71358-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: Timotej Lazar <timotej.lazar <at> araneo.si>
Cc: 71358-done <at> debbugs.gnu.org
Subject: Re: [bug#71358] [PATCH 0/2] Update tig
Date: Tue, 18 Jun 2024 08:42:44 +0300

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

Thanks. Patch pushed!

-- 
Efraim Flashner   <efraim <at> flashner.co.il>   רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

Previous Next

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