[PATCH 0/9] Update fzf to 0.52.1

  • Open
  • quality assurance status badge
Details
3 participants
  • Andreas Enge
  • Luis Higino
  • Sharlatan Hellseher
Owner
unassigned
Submitted by
Luis Higino
Severity
normal
L
L
Luis Higino wrote on 18 May 02:32 +0200
(address . guix-patches@gnu.org)(name . Luis Higino)(address . luishenriquegh2701@gmail.com)
cover.1715964816.git.luishenriquegh2701@gmail.com
Hi Guix,

this patch series updates fzf to version 0.52.1. In the process, I had to
update the go version of some depending libraries, which resulted in some
other packages failing to build. I tried to fix all related packages, but the
amount of changes came to a point where I think I'll have missed some
more. I'm hoping guix ci to help me with this, as I'm willing to fix them all
myself.

*** BLURB HERE ***

Luis Higino (9):
gnu: Add go-github-com-charlievieth-fastwalk.
gnu: aerc: Update go version.
gnu: vale: Update go version.
gnu: senpai: Update go version.
gnu: chezmoi: Update go version.
gnu: games.scm: Update go versions.
gnu: golang-xyz.scm: Update go versions.
gnu: golang.scm: Update packages and go versions.
gnu: go-github-com-junegunn-fzf: Update to 0.52.1.

gnu/packages/configuration-management.scm | 67 +++++++++----------
gnu/packages/games.scm | 8 ++-
gnu/packages/golang-xyz.scm | 6 +-
gnu/packages/golang.scm | 78 +++++++++++++++++------
gnu/packages/mail.scm | 3 +-
gnu/packages/messaging.scm | 1 +
gnu/packages/terminals.scm | 15 +++--
gnu/packages/textutils.scm | 1 +
8 files changed, 120 insertions(+), 59 deletions(-)


base-commit: e4ee595999a3b0656f416d190b28ec6f1ad8a74d
--
2.41.0
L
L
Luis Higino wrote on 18 May 03:11 +0200
[PATCH 1/9] gnu: Add go-github-com-charlievieth-fastwalk.
(address . 71023@debbugs.gnu.org)(name . Luis Higino)(address . luishenriquegh2701@gmail.com)
3920d79b6fd5d3c3884a75e8bc2b52b51aafb96e.1715964816.git.luishenriquegh2701@gmail.com
* gnu/packages/golang.scm (go-github-com-charlievieth-fastwalk): New variable.

Change-Id: Id51606ed3934c5ec46616d1c1d6db2f6c1e8124c
---
gnu/packages/golang.scm | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)

Toggle diff (46 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index aeb205571c..e39da8f9ed 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -45,6 +45,7 @@
;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
;;; Copyright © 2024 Greg Hogan <code@greghogan.com>
+;;; Copyright © 2024 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3229,6 +3230,31 @@ (define-public go-github-com-saracen-walker
(description "The @code{walker} function is a faster, parallel version, of
@code{filepath.Walk}")))
+(define-public go-github-com-charlievieth-fastwalk
+ (package
+ (name "go-github-com-charlievieth-fastwalk")
+ (version "1.0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/charlievieth/fastwalk")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16wvz9i573ill0nrbw8cx7z3hvxjfb4pmj5b85brh9bwmc71z3rz"))))
+ (build-system go-build-system)
+ (arguments
+ (list
+ #:go go-1.18
+ #:import-path "github.com/charlievieth/fastwalk"))
+ (home-page "https://github.com/charlievieth/fastwalk")
+ (synopsis "Fast directory traversal for Golang")
+ (description
+ "The @code{fastwalk} package provides a fast parallel version of
+@code{filepath.Walk} for file system scanning tools.")
+ (license license:expat)))
+
(define-public go-github-com-tdewolff-hasher
(package
(name "go-github-com-tdewolff-hasher")
--
2.41.0
L
L
Luis Higino wrote on 18 May 03:11 +0200
[PATCH 2/9] gnu: aerc: Update go version.
(address . 71023@debbugs.gnu.org)(name . Luis Higino)(address . luishenriquegh2701@gmail.com)
b82b51ad1614e51f102aa8dbe38033d0d690dc7d.1715964816.git.luishenriquegh2701@gmail.com
* gnu/packages/mail.scm (aerc): Update go version.

Change-Id: I3a078f8b472c285429a8ada91480aebb01a19178
---
gnu/packages/mail.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (16 lines)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index b15d891609..dc83f852b1 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -4977,7 +4977,8 @@ (define-public aerc
"1gbprx0i8d13q974n5hsys6lllav5cpll3cwrr1hfw6307hc001r"))))
(build-system go-build-system)
(arguments
- (list #:import-path "git.sr.ht/~rjarry/aerc"
+ (list #:go go-1.18
+ #:import-path "git.sr.ht/~rjarry/aerc"
;; Installing the source is only necessary for Go libraries.
#:install-source? #f
#:build-flags
--
2.41.0
L
L
Luis Higino wrote on 18 May 03:11 +0200
[PATCH 3/9] gnu: vale: Update go version.
(address . 71023@debbugs.gnu.org)(name . Luis Higino)(address . luishenriquegh2701@gmail.com)
9b94ce4a55c41e3ae19ede41b891e4026e5507c1.1715964816.git.luishenriquegh2701@gmail.com
* gnu/packages/textutils.scm (vale): Update go version.

Change-Id: I60b3bba02eb7a764c62fb2b8c0abc9a73e2be18b
---
gnu/packages/textutils.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index b58038dcc2..9cd6bdb2c2 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1458,6 +1458,7 @@ (define-public vale
(build-system go-build-system)
(arguments
(list #:install-source? #f
+ #:go go-1.18
#:import-path "github.com/errata-ai/vale"))
(native-inputs
(list go-github-com-fatih-color
--
2.41.0
L
L
Luis Higino wrote on 18 May 03:11 +0200
[PATCH 4/9] gnu: senpai: Update go version.
(address . 71023@debbugs.gnu.org)(name . Luis Higino)(address . luishenriquegh2701@gmail.com)
1be29a96609128959eac748ff693075aac768b33.1715964816.git.luishenriquegh2701@gmail.com
* gnu/packages/messaging.scm (senpai): Update go version.

Change-Id: Ieafbc1d9bdc08233a7ea15189961975c8a98b8a6
---
gnu/packages/messaging.scm | 1 +
1 file changed, 1 insertion(+)

Toggle diff (14 lines)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 83463f44c6..2923fe5801 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3589,6 +3589,7 @@ (define-public senpai
(build-system go-build-system)
(arguments
(list #:import-path "git.sr.ht/~taiite/senpai/cmd/senpai"
+ #:go go-1.18
#:unpack-path "git.sr.ht/~taiite/senpai"
#:install-source? #f
#:phases
--
2.41.0
L
L
Luis Higino wrote on 18 May 03:11 +0200
[PATCH 5/9] gnu: chezmoi: Update go version.
(address . 71023@debbugs.gnu.org)(name . Luis Higino)(address . luishenriquegh2701@gmail.com)
4b90f13cc76d9ce76948e9c5de30ec8ea1b19474.1715964816.git.luishenriquegh2701@gmail.com
* gnu/packages/configuration-management.scm (chezmoi): Update go version.

Change-Id: Iac2d344a4b48fc9296528bee84a59598ff45c61b
---
gnu/packages/configuration-management.scm | 67 ++++++++++++-----------
1 file changed, 35 insertions(+), 32 deletions(-)

Toggle diff (87 lines)
diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index de27f50e0c..d67db49e7a 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -18,6 +18,7 @@
(define-module (gnu packages configuration-management)
#:use-module (gnu packages)
+ #:use-module (guix gexp)
#:use-module (guix build-system go)
#:use-module (guix git-download)
#:use-module (gnu packages golang)
@@ -45,38 +46,40 @@ (define-public chezmoi
"0ildvlq7v8vnw74y4fgnv3hpq49bpl6zh1wmakfh46crwg7ffmjb"))))
(build-system go-build-system)
(arguments
- `(#:import-path "github.com/twpayne/chezmoi"
- #:install-source? #f
- #:phases
- (modify-phases %standard-phases
- ;; Remove test script which expect additional user's programs available
- ;; in the PATH. The testdata directory is removed in the latest version
- ;; (2.46.1) of the program.
- (add-after 'unpack 'remove-failing-test-scripts
- (lambda* (#:key import-path #:allow-other-keys)
- (for-each (lambda (f)
- (delete-file (string-append "src/" import-path "/testdata/scripts/" f)))
- '("bitwarden.txt"
- "cd.txt"
- "cd_unix.txt"
- "completion.txt"
- "diff.txt"
- "edit.txt"
- "editconfig.txt"
- "git.txt"
- "gopass.txt"
- "keepassxc.txt"
- "lastpass.txt"
- "onepassword.txt"
- "pass.txt"
- "runscriptdir_unix.txt"
- "script_unix.txt"
- "secretgeneric.txt"
- "secretgopass.txt"
- "secretkeepassxc.txt"
- "secretlastpass.txt"
- "secretonepassword.txt"
- "secretpass.txt")))))))
+ (list
+ #:go go-1.18
+ #:import-path "github.com/twpayne/chezmoi"
+ #:install-source? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Remove test script which expect additional user's programs available
+ ;; in the PATH. The testdata directory is removed in the latest version
+ ;; (2.46.1) of the program.
+ (add-after 'unpack 'remove-failing-test-scripts
+ (lambda* (#:key import-path #:allow-other-keys)
+ (for-each (lambda (f)
+ (delete-file (string-append "src/" import-path "/testdata/scripts/" f)))
+ '("bitwarden.txt"
+ "cd.txt"
+ "cd_unix.txt"
+ "completion.txt"
+ "diff.txt"
+ "edit.txt"
+ "editconfig.txt"
+ "git.txt"
+ "gopass.txt"
+ "keepassxc.txt"
+ "lastpass.txt"
+ "onepassword.txt"
+ "pass.txt"
+ "runscriptdir_unix.txt"
+ "script_unix.txt"
+ "secretgeneric.txt"
+ "secretgopass.txt"
+ "secretkeepassxc.txt"
+ "secretlastpass.txt"
+ "secretonepassword.txt"
+ "secretpass.txt")))))))
(native-inputs
(list go-etcd-io-bbolt
go-github-com-alecthomas-chroma
--
2.41.0
L
L
Luis Higino wrote on 18 May 03:11 +0200
[PATCH 6/9] gnu: games.scm: Update go versions.
(address . 71023@debbugs.gnu.org)(name . Luis Higino)(address . luishenriquegh2701@gmail.com)
40d68a4bb6a3ea0fbbb51701f99cef817e423ab9.1715964816.git.luishenriquegh2701@gmail.com
* gnu/packages/games.scm (go-github-com-anaseto-gruid-tcell): Update go version.
* gnu/packages/games.scm (harmonist): Update go version.

Change-Id: I090bb7a41a9e42002a14ca509fc7292d609045cf
---
gnu/packages/games.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)

Toggle diff (28 lines)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 03a36a8a6d..b1da89e40e 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -10055,7 +10055,9 @@ (define-public go-github-com-anaseto-gruid-tcell
"09ajr9mbldjfc44qprplbf8dr8yhlbn2nfnas2z62m9wmklc0qiv"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/anaseto/gruid-tcell"))
+ (list
+ #:go go-1.18
+ #:import-path "github.com/anaseto/gruid-tcell"))
(propagated-inputs
`(("go-github-com-gdamore-tcell-v2" ,go-github-com-gdamore-tcell-v2)
("go-github-com-anaseto-gruid" ,go-github-com-anaseto-gruid)))
@@ -10080,7 +10082,9 @@ (define-public harmonist
"17ai39pw9xq4asfvhs0whx07hljlivygazbwrxjrnxwrn06483hr"))))
(build-system go-build-system)
(arguments
- '(#:import-path "git.tuxfamily.org/harmonist/harmonist"))
+ (list
+ #:go go-1.18
+ #:import-path "git.tuxfamily.org/harmonist/harmonist"))
(inputs
`(("go-github-com-gdamore-tcell-v2" ,go-github-com-gdamore-tcell-v2)
("go-github.com-nsf-termbox-go" ,go-github.com-nsf-termbox-go)
--
2.41.0
L
L
Luis Higino wrote on 18 May 03:11 +0200
[PATCH 7/9] gnu: golang-xyz.scm: Update go versions.
(address . 71023@debbugs.gnu.org)(name . Luis Higino)(address . luishenriquegh2701@gmail.com)
791380ea6b3d0ed7ad7e21fa0cc1dc4f16677e5d.1715964816.git.luishenriquegh2701@gmail.com
* gnu/packages/golang-xzy.scm (go-github-com-mattn-go-pointer): Update go version.
* gnu/packages/golang-xzy.scm (go-github-com-mattn-go-runewidth): Update go version.

Change-Id: Ifc851b05d7c4d7fbb274e0753b562bc03103e040
---
gnu/packages/golang-xyz.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

Toggle diff (36 lines)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index e69a65c3da..5f1909285a 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -36,6 +36,7 @@
;;; Copyright © 2024 Herman Rimm <herman@rimm.ee>
;;; Copyright © 2024 Jesse Eisses <jesse@eisses.email>
;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
+;;; Copyright © 2024 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -2266,7 +2267,7 @@ (define-public go-github-com-mattn-go-pointer
(define-public go-github-com-mattn-go-runewidth
(package
(name "go-github-com-mattn-go-runewidth")
- (version "0.0.14")
+ (version "0.0.15")
(source
(origin
(method git-fetch)
@@ -2275,10 +2276,11 @@ (define-public go-github-com-mattn-go-runewidth
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1iaqw5pd7f4f2xz37540kp0828p2820g4vxx3hz089hwl331sx1v"))))
+ (base32 "0v8sh6y3dsdd1qn1pc6p3kpqv0hf06ww5rw7r70hdbcl9l8zvzaq"))))
(build-system go-build-system)
(arguments
(list
+ #:go go-1.18
#:import-path "github.com/mattn/go-runewidth"))
(propagated-inputs
(list go-github-com-rivo-uniseg))
--
2.41.0
L
L
Luis Higino wrote on 18 May 03:11 +0200
[PATCH 8/9] gnu: golang.scm: Update packages and go versions.
(address . 71023@debbugs.gnu.org)(name . Luis Higino)(address . luishenriquegh2701@gmail.com)
795a9d1b538a909dc25d03e2aa0bea1417cab8e0.1715964816.git.luishenriquegh2701@gmail.com
* gnu/packages/golang.scm (go-github-com-gdamore-tcell): Update to 1.4.0.
* gnu/packages/golang.scm (go-github-com-gdamore-tcell-v2): Update to 2.7.4.
* gnu/packages/golang.scm (go-github-com-rivo-uniseg): Update to 0.4.7.
* gnu/packages/golang.scm: Update go versions.

Change-Id: Ib9532428ad4d5a4d6a480a4651ee7ffc70d0b059
---
gnu/packages/golang.scm | 52 +++++++++++++++++++++++++++--------------
1 file changed, 34 insertions(+), 18 deletions(-)

Toggle diff (159 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e39da8f9ed..3a907ef6ab 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5580,29 +5580,30 @@ (define-public go-github-com-cespare-mph
(license license:expat)))
(define-public go-github-com-gdamore-tcell
- (let ((commit "aaadc574a6ed8dc3abe56036ca130dcee1ee6b6e")
- (version "1.1.2")
- (revision "1"))
(package
(name "go-github-com-gdamore-tcell")
- (version (git-version version revision commit))
+ (version "1.4.0")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/gdamore/tcell")
- (commit commit)))
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
- "0il2nnxp2cqiy73m49215dnf9in3vd25ji8qxbmq87c5qy7i1q9d"))))
+ "178h7kj4zb8lcw84nbqanapnxrgvhq4111xw4fj6m56y46anlzwg"))))
(build-system go-build-system)
(arguments
- `(#:import-path "github.com/gdamore/tcell"))
+ (list
+ #:go go-1.18
+ #:import-path "github.com/gdamore/tcell"))
(inputs
(list go-github-com-mattn-go-runewidth
+ go-github-com-rivo-uniseg
go-github-com-lucasb-eyer-go-colorful
go-golang-org-x-text
+ go-golang-org-x-sys
go-github-com-gdamore-encoding))
(home-page "https://github.com/gdamore/tcell")
(synopsis "Provide a cell-based view for text terminals")
@@ -5610,13 +5611,13 @@ (define-public go-github-com-gdamore-tcell
terminfo capability strings to avoid hard-coding escape strings for
formatting. It also favors portability, and includes support for all POSIX
systems.")
- (license license:asl2.0))))
+ (license license:asl2.0)))
(define-public go-github-com-gdamore-tcell-v2
(package
(inherit go-github-com-gdamore-tcell)
(name "go-github-com-gdamore-tcell")
- (version "2.6.0")
+ (version "2.7.4")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -5625,9 +5626,10 @@ (define-public go-github-com-gdamore-tcell-v2
(file-name (git-file-name name version))
(sha256
(base32
- "0126hi8glnfqdx4l9zlh6dhd5f5c8bws7arv9pp4n2kqcnhdc6g2"))))
+ "05b22sgyf8lnwjddxlfvlj7i8b67gnidhbnz86vvx8fddggpa5nd"))))
(arguments
(list #:import-path "github.com/gdamore/tcell/v2"
+ #:go go-1.18
#:phases
#~(modify-phases %standard-phases
(add-before 'reset-gzip-timestamps 'make-files-writable
@@ -5655,7 +5657,9 @@ (define-public go-git-sr-ht-rockorager-tcell-term
"177ladvpiiw7sb0hsjjv9p2yv5wpqpw6nqardkm8mqqlj0swa9xx"))))
(build-system go-build-system)
(arguments
- (list #:import-path "git.sr.ht/~rockorager/tcell-term"))
+ (list
+ #:go go-1.18
+ #:import-path "git.sr.ht/~rockorager/tcell-term"))
(propagated-inputs
(list go-golang-org-x-sys
go-golang-org-x-term
@@ -5687,7 +5691,9 @@ (define-public go-github-com-rivo-tview
"0gf1m3ndbc3kgxpv0ryq9a1ahijg6m896sc9k7dvwfjd8vy0q0yd"))))
(build-system go-build-system)
(arguments
- (list #:import-path "github.com/rivo/tview"))
+ (list
+ #:go go-1.18
+ #:import-path "github.com/rivo/tview"))
(propagated-inputs (list go-golang-org-x-term
go-golang-org-x-sys
go-github-com-rivo-uniseg
@@ -7174,7 +7180,9 @@ (define-public go-github-com-olekukonko-tablewriter
"02r0n2b9yh3x8xyf48k17dxlwj234hlgjycylbjxi6qg08hfmz2x"))))
(build-system go-build-system)
(arguments
- `(#:import-path "github.com/olekukonko/tablewriter"))
+ (list
+ #:go go-1.18
+ #:import-path "github.com/olekukonko/tablewriter"))
(propagated-inputs
(list go-github-com-mattn-go-runewidth))
(home-page "https://github.com/olekukonko/tablewriter/")
@@ -8804,7 +8812,7 @@ (define-public go-github-com-vmihailenco-tagparser
(define-public go-github-com-rivo-uniseg
(package
(name "go-github-com-rivo-uniseg")
- (version "0.2.0")
+ (version "0.4.7")
(source
(origin
(method git-fetch)
@@ -8813,9 +8821,12 @@ (define-public go-github-com-rivo-uniseg
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "0j7h22vfmjj562vr8gpsyrkrwp1pq9ayh5fylv24skxb467g9f0q"))))
+ (base32 "0nlcqyvq4vhq3hqhk84h6fp0jbqkjj88kcpcl853yr7sh4sisdxc"))))
(build-system go-build-system)
- (arguments '(#:import-path "github.com/rivo/uniseg"))
+ (arguments
+ (list
+ #:go go-1.18
+ #:import-path "github.com/rivo/uniseg"))
(home-page "https://github.com/rivo/uniseg")
(synopsis "Unicode Text Segmentation for Go")
(description
@@ -9471,6 +9482,7 @@ (define-public go-github-com-jaytaylor-html2text
(build-system go-build-system)
(arguments
(list #:import-path "github.com/jaytaylor/html2text"
+ #:go go-1.18
;; Tests are broken: <https://github.com/jaytaylor/html2text/issues/53>
#:tests? #f))
(propagated-inputs (list go-golang-org-x-net
@@ -9498,7 +9510,9 @@ (define-public go-github-com-jhillyerd-enmime
"124dqm598phbmalyx2gmxk201z9kq4ckvvdq8rc0akjlp24nxqbb"))))
(build-system go-build-system)
(arguments
- (list #:import-path "github.com/jhillyerd/enmime"))
+ (list
+ #:go go-1.18
+ #:import-path "github.com/jhillyerd/enmime"))
(propagated-inputs (list go-golang-org-x-text
go-golang-org-x-net
go-github-com-stretchr-testify
@@ -9533,7 +9547,9 @@ (define-public go-github-com-gatherstars-com-jwz
"1zxg2vmka80m1vnlb1v1gdlrwnkpakcmwi1hxpl8jjjiyd4z2j2i"))))
(build-system go-build-system)
(arguments
- (list #:import-path "github.com/gatherstars-com/jwz"))
+ (list
+ #:go go-1.18
+ #:import-path "github.com/gatherstars-com/jwz"))
(propagated-inputs (list go-github-com-rivo-tview
go-github-com-jhillyerd-enmime
go-github-com-gdamore-tcell-v2))
--
2.41.0
L
L
Luis Higino wrote on 18 May 03:11 +0200
[PATCH 9/9] gnu: go-github-com-junegunn-fzf: Update to 0.52.1.
(address . 71023@debbugs.gnu.org)(name . Luis Higino)(address . luishenriquegh2701@gmail.com)
0129ec35793f67e954e29625c7bdc79dc02569ca.1715964816.git.luishenriquegh2701@gmail.com
* gnu/packages/terminals.scm (go-github-com-junegunn-fzf): Update to 0.52.1.
* gnu/packages/terminals.scm: Update go versions.

Change-Id: Ib2bdec1cd31dd7f848edb938399a93b40599fb09
---
gnu/packages/terminals.scm | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)

Toggle diff (53 lines)
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 1c1294f663..ea70a8b42d 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -40,6 +40,7 @@
;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com>
;;; Copyright © 2024 Suhail <suhail@bayesians.ca>
;;; Copyright © 2024 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2024 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1003,7 +1004,9 @@ (define-public go-github.com-nsf-termbox-go
"0hdyisfaf8yb55h3p03p4sbq19546mp9fy28f2kn659mycmhxqk4"))))
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/nsf/termbox-go"))
+ (list
+ #:go go-1.18
+ #:import-path "github.com/nsf/termbox-go"))
(propagated-inputs
(list go-github-com-mattn-go-runewidth))
(synopsis "@code{termbox} provides a minimal API for text-based user
@@ -1017,7 +1020,7 @@ (define-public go-github.com-nsf-termbox-go
(define-public go-github-com-junegunn-fzf
(package
(name "go-github-com-junegunn-fzf")
- (version "0.41.0")
+ (version "0.52.1")
(source
(origin
(method git-fetch)
@@ -1027,12 +1030,16 @@ (define-public go-github-com-junegunn-fzf
(file-name (git-file-name name version))
(sha256
(base32
- "1l9nsvziip3azyvg8wi4g3x606fh6w9vpfcbcgjdzdnp2ywqciim"))))
+ "0jvn3wbjb22s3yfmaxvj6xx6gy8b3w25pv05bdd51aqaa2gwywkj"))))
(build-system go-build-system)
(arguments
- `(#:import-path "github.com/junegunn/fzf"))
+ (list
+ #:go go-1.20
+ #:import-path "github.com/junegunn/fzf"))
(inputs
(list go-github-com-mattn-go-runewidth
+ go-github-com-charlievieth-fastwalk
+ go-github-com-gdamore-tcell
go-github-com-mattn-go-shellwords
go-github-com-mattn-go-isatty
go-github-com-gdamore-tcell
--
2.41.0
S
S
Sharlatan Hellseher wrote on 21 May 22:49 +0200
[PATCH 0/9] Update fzf to 0.52.1
(address . 71023@debbugs.gnu.org)
871q5uao1l.fsf@gmail.com
Hi,

Thank you for the patches.

From the first glance, some of the changes need to be grouped as single commit
- [PATCH 8/9] gnu: golang.scm: Update packages and go versions.

A general cement to all of them - is everything related just to bump fzf
to the latest version or it's a collection of not related patches?

I'm on the way to update valve to the latest version which is quite a
massive change in dependencies tree.

Also try to avoid adding any new packages to golang.scm.

--
Oleg
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEmEeB3micIcJkGAhndtcnv/Ys0rUFAmZNCMYACgkQdtcnv/Ys
0rV1hw//RZJaGneh2usF95PtCYbpdY4cbrFsKAsN9FivDlM91bb5r+ZkfG0E8HZ6
X4wGGH2vlCm1A7vlSsjEqxKt0t4PQk9w+6pX7Y5uFonjVctDtKtqgiMyJDujUAWd
djOhiHrZpDIu6VoxovZrmjbjwx9d6QJxqYncuAal2Djxe+j4L3Am/jjZxTDV2KUJ
13ddk954hwmNPIhZTV1MXBZtRe9UtivYTUaqeNYdcgFmPXTYfWAeUjE4rv2or1AS
2BtgKmP7y6cpj0S1JtPUlDK5ui6RCgnRewXUZ8Y0vL8Lj4sZzzfJgka7bJ0MW9yU
A6yLsexaf0A1w98z4qtQVR72XYX5zDH4b5XL0JE/CORyMWj+SwTETwqxLoUPorcR
wD4tqD45pgDHFmR7QgZwzhgcUZcDXsWSchOmt7cUg2dLBSo2W6IFB0QxbJcA63pb
Ld9G06ZiSSivig7snuu/qngnOWuNh+LCAO2Whl3XxqgLvBNbMiZsbYK0K5av9fFc
S9V06/jvRZzfDGVgjMV2DxnJCRQLudpTnpxpxELcG8L1kjImqIWky5C46RNAaAbs
nb0imfYWZNEHb4d6H+0MIacHiiNTkcgU2bAU7AMtfnsnGG3J6Q9/MNPTAHoxwICa
LkJ1FfiJLmCT2BBNh462G4AM32fz3gLhNkNzsG1JZ7d4lLu/4co=
=XLH7
-----END PGP SIGNATURE-----

L
L
Luis Henrique Gomes Higino wrote on 4 Jun 19:00 +0200
(address . 71023@debbugs.gnu.org)(address . sharlatanus@gmail.com)
87sexs8wz3.fsf@gmail.com
Hi Oleg,

Toggle quote (4 lines)
> From the first glance, some of the changes need to be grouped as
> single commit - [PATCH 8/9] gnu: golang.scm: Update packages and
> go versions.

thanks for the feedback! I didn't know it was OK to group commits,
do you think all commits before the last one should be grouped?

Toggle quote (4 lines)
> A general cement to all of them - is everything related just to
> bump fzf to the latest version or it's a collection of not
> related patches?

So, to upgrade fzf I had to update some of its dependencies and,
due to it, had to update their go versions from 17 to 18. When I
checked if any other dependent packages were affected with =guix
refresh=, it showed to me that the packages were not building
because they were compiled with Go 17 and it seems the
=go-build-system= vendorizes all package dependencies before
building. I tried fixing only the packages that were broken, so I
guess they are all related in that sense. I'm totally open to
being convinced otherwise though :)

Toggle quote (2 lines)
> Also try to avoid adding any new packages to golang.scm.

OK, I read some other packages there and it seemed to me that
=fastwalk= was similar in nature to the ones near it (where I
inserted it). Should I move it to =golang-xyz.scm= instead?
Attachment: file
--
Luis H. Higino
A
A
Andreas Enge wrote on 10 Jun 12:14 +0200
Groups
(address . 71023@debbugs.gnu.org)
ZmbSIK--aNscprh0@jurong
Hello,

I think there has been some misunderstanding, it is the other way round:
Every package change needs its own commit, even if they are in the same
file. So commit 8/9 should be split into several ones.

When doing so, you may wish to use the ./etc/committer.scm script in the
source tree: Update a package and run the script, which often creates a
good commit.

Updating many packages at the same time can become a bit unwieldy; it
might be easier to update in smaller chunks, starting with only some
dependencies (if this is possible depends of course on how entangled
the situation is).

Andreas
?
Your comment

Commenting via the web interface is currently disabled.

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

To respond to this issue using the mumi CLI, first switch to it
mumi current 71023
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