[bug#71358] [PATCH 0/2] Update tig

[bug#71358] [PATCH 0/2] Update tig

[Timotej Lazar]

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

[bug#71358] [PATCH 1/2] gnu: tig: Update to 2.5.10.

[Timotej Lazar]

* 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

[bug#71358] [PATCH 2/2] gnu: tig: Update package style.

[Timotej Lazar]

* 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

bug#71358: [PATCH 0/2] Update tig

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

Thanks. Patch pushed!

-- 
Efraim Flashner   <efraim@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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]