[PATCH 0/2] Update tig

  • Done
  • quality assurance status badge
Details
2 participants
  • Efraim Flashner
  • Timotej Lazar
Owner
unassigned
Submitted by
Timotej Lazar
Severity
normal
T
T
Timotej Lazar wrote on 4 Jun 10:35 +0200
(address . guix-patches@gnu.org)(name . Timotej Lazar)(address . timotej.lazar@araneo.si)
cover.1717489984.git.timotej.lazar@araneo.si
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
T
T
Timotej Lazar wrote on 4 Jun 10:50 +0200
[PATCH 1/2] gnu: tig: Update to 2.5.10.
(address . 71358@debbugs.gnu.org)(name . Timotej Lazar)(address . timotej.lazar@araneo.si)
57587897e429aac4c28e6f320e49f575446361eb.1717489984.git.timotej.lazar@araneo.si
* 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(-)

Toggle diff (41 lines)
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
T
T
Timotej Lazar wrote on 4 Jun 10:50 +0200
[PATCH 2/2] gnu: tig: Update package style.
(address . 71358@debbugs.gnu.org)(name . Timotej Lazar)(address . timotej.lazar@araneo.si)
bf8886003ce3eae14528911f78762b40b50773c3.1717489984.git.timotej.lazar@araneo.si
* 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(-)

Toggle diff (53 lines)
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
E
E
Efraim Flashner wrote on 18 Jun 07:42 +0200
Re: [bug#71358] [PATCH 0/2] Update tig
(name . Timotej Lazar)(address . timotej.lazar@araneo.si)(address . 71358-done@debbugs.gnu.org)
ZnEeVJBiltWdtS50@3900XT
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
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmZxHlMACgkQQarn3Mo9
g1FoVhAAmSAJcUbUmEcmPm9hoSjbw9/bJBX42oWnWUU07J05qSYxVDucBE1DXf3q
AWhf+u4IoD1cAEw0azdnPKaJKo4wsiSl9YMXkGs6GNpsJwQfcm92lVp0YwzB3iIj
xxz3gyXVgjT8gCYuaySNcDiK8GbF7z4425nzUk+OEicYyAe/yzTQ/3my873n+Px5
uc+vo/yjJNQh8zUyv6ufsCPVYSD5cqq0lzfFAYSwloAMBdKUC2Jqf48FwxI/+9uS
RkO+bmE6NYcPhtuAUXcX9aU0M4mGMiCsdqjram6zRJUettahIP3zunnOSDizjIBc
I735YV+XF8n1a2S6GdvjAduVwRJ1hatgsAQUymr3R1jPm5AB/amEt1MvnS693/9s
zIN0FfM2Exlt8jD53TZhqbgGzZhm7/V0DdUt7yGULjbsFBkbRpTrK3pxlB4teFpZ
SrFOAZh5OtuBxpGK+Fs32Vtz/rW6qLT2B3TT5D1OjOVaBLbwmGMPCFdhz2Zf3bTk
Ds8Vjz+G2psQLPezimkzM2uptI3g27lYk2v7pHVWDmIdiEZfhfdg0jZqJ0fNXMCv
BgUTc8kA2HFh2QNP2u+jRp6SSpqQV+Scfe6U+b+s+YzWATMMds+qP13UfSR4Kvmv
G4JS9nIZi6A/ODcuXvPqmNNyFRZDheQ+PfcIjMv1Q38X9Xe/dpg=
=5R+P
-----END PGP SIGNATURE-----


Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 71358@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 71358
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch