sharlatan pushed a commit to branch go-team
in repository guix.
commit e0c662d9069c2b1e238dc9790d88babb3acda8b7
Author: Daniel Ziltener <[email protected]>
AuthorDate: Wed Apr 9 02:14:56 2025 +0200
gnu: go-git-sr-ht-emersion-go-scfg: Update to 0.1.0.
*gnu/packages/golang-xyz.scm (go-git-sr-ht-emersion-go-scfg): Update to
0.1.0. Rename to go-codeberg-org-emersion-go-scfg to reflect new import
path.
* gnu/packages/irc.scm (soju) [native-inputs]: Remove
go-git-sr-ht-emersion-go-scfg; add go-codeberg-org-emersion-go-scfg.
* gnu/packages/messaging.scm (senpai): Likewise.
* gnu/packages/version-control.scm (hut) [source] <snippet>: Fix
import-name for go-codeberg-org-emersion-go-scfg.
[native-inputs]: Remove go-git-sr-ht-emersion-go-scfg; add
go-codeberg-org-emersion-go-scfg.
Change-Id: Ide0e5d2d5463991add1d2d99f57298f800535173
Co-authored-by: Sharlatan Hellseher <[email protected]>
Signed-off-by: Sharlatan Hellseher <[email protected]>
---
gnu/packages/golang-xyz.scm | 16 ++++++++--------
gnu/packages/irc.scm | 3 +--
gnu/packages/messaging.scm | 2 +-
gnu/packages/version-control.scm | 13 +++++++++++--
4 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index aedbe97864..3eeacd1c8d 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -380,25 +380,25 @@ recursively any exported one. It also won't merge
structs inside
maps (because they are not addressable using Go reflection).")
(license license:bsd-3)))
-(define-public go-git-sr-ht-emersion-go-scfg
+(define-public go-codeberg-org-emersion-go-scfg
(package
- (name "go-git-sr-ht-emersion-go-scfg")
- (version "0.0.0-20240128091534-2ae16e782082")
+ (name "go-codeberg-org-emersion-go-scfg")
+ (version "0.1.0")
(source
(origin
(method git-fetch)
(uri (git-reference
- (url "https://git.sr.ht/~emersion/go-scfg";)
- (commit (go-version->git-ref version))))
+ (url "https://codeberg.org/emersion/go-scfg";)
+ (commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1gxhg40q4md3lj1wrrnms0jhyqsxhx2hcv6sm5yjbbqana5x26mx"))))
+ (base32 "0yw35rf6cxk5cwzf9y4qd0rlcryq1pxr9n34q6620i9djhgskwq2"))))
(build-system go-build-system)
(arguments
- (list #:import-path "git.sr.ht/~emersion/go-scfg"))
+ (list #:import-path "codeberg.org/emersion/go-scfg"))
(propagated-inputs
(list go-github-com-davecgh-go-spew))
- (home-page "https://git.sr.ht/~emersion/go-scfg";)
+ (home-page "https://codeberg.org/emersion/go-scfg";)
(synopsis "Go library for simple configuration file format")
(description
"Package go-scfg parses scfg files.")
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 9e47bca87c..c8dfdfe1ad 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -1263,7 +1263,7 @@ seen, tell, and what.")
(setenv "PREFIX" #$output)
(invoke "make" "install")))))))
(native-inputs
- (list go-git-sr-ht-emersion-go-scfg
+ (list go-codeberg-org-emersion-go-scfg
go-git-sr-ht-emersion-go-sqlite3-fts5
go-git-sr-ht-sircmpwn-go-bare
go-github-com-coder-websocket
@@ -1288,4 +1288,3 @@ such as multiple users, numerous
@@url{https://ircv3.net/,IRCv3} extensions,
chat history playback and detached channels. It is well-suited for both small
and large deployments.")
(license license:agpl3)))
-
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 54a6e9c5d5..802136149f 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3743,7 +3743,7 @@ a text snippet), using @code{libphonenumber}.")
(string-append "src/" unpack-path "/doc/senpai.5")
man5)))))))
(native-inputs
- (list go-git-sr-ht-emersion-go-scfg
+ (list go-codeberg-org-emersion-go-scfg
go-github-com-delthas-go-libnp
go-github-com-delthas-go-localeinfo
go-github-com-delthas-tcell-v2 ; remove in the next release
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 0895c443be..96845f8d57 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -4743,7 +4743,16 @@ developer workflow, and project and release management.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "14cia976i2jdzyzw4wk9fhkh6zqgmb09ryf31ys24smmfcdfxyf1"))))
+ (base32 "14cia976i2jdzyzw4wk9fhkh6zqgmb09ryf31ys24smmfcdfxyf1"))
+ (modules '((guix build utils)))
+ (snippet
+ #~(begin
+ ;; XXX: Module name has been changed upstream, it's already
+ ;; adjusted on master, consider to remove in the next refresh
+ ;; cycle.
+ (substitute* (find-files "." "\\.go$")
+ (("git.sr.ht/~emersion/go-scfg")
+ "codeberg.org/emersion/go-scfg"))))))
(build-system go-build-system)
(arguments
(list
@@ -4764,7 +4773,7 @@ developer workflow, and project and release management.")
(native-inputs
(list scdoc))
(inputs
- (list go-git-sr-ht-emersion-go-scfg
+ (list go-codeberg-org-emersion-go-scfg
go-git-sr-ht-emersion-gqlclient
go-github-com-dustin-go-humanize
go-github-com-google-shlex
