GNU bug report logs - #77660
[PATCH 0/5] Update senpai, soju, and dependencies

Previous Next

To reply to this bug, email your comments to 77660 AT debbugs.gnu.org.
There is no need to reopen the bug first.

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

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

From: Daniel Ziltener <dziltener <at> lyrion.ch>
To: guix-patches <at> gnu.org
Cc: Daniel Ziltener <dziltener <at> lyrion.ch>
Subject: [PATCH 0/5] Update senpai, soju, and dependencies
Date: Wed,  9 Apr 2025 02:10:56 +0200

I made a couple patches to bring senpai, soju, and its dependencies up to their currently needed versions.

Daniel Ziltener (5):
  gnu: go-codeberg-org-emersion-go-scfg: Update to 0.1.0.
  gnu: go-git-sr-ht-rockorager-vaxis: Update to 0.13.0.
  gnu: senpai: Update to 0.4.0.
  gnu: go-github-com-sherclockholmes-webpush-go: Update to 1.4.0.
  gnu: soju: Update to 0.9.0.

 gnu/packages/golang-web.scm      |  6 +++---
 gnu/packages/golang-xyz.scm      | 20 ++++++++++----------
 gnu/packages/irc.scm             | 10 ++++------
 gnu/packages/messaging.scm       | 25 +++++++++++++++----------
 gnu/packages/version-control.scm |  2 +-
 5 files changed, 33 insertions(+), 30 deletions(-)

-- 
2.49.0

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

From: Daniel Ziltener <dziltener <at> lyrion.ch>
To: 77660 <at> debbugs.gnu.org
Cc: Daniel Ziltener <dziltener <at> lyrion.ch>
Subject: [PATCH 1/5] gnu: go-codeberg-org-emersion-go-scfg: Update to 0.1.0.
Date: Wed,  9 Apr 2025 02:14:56 +0200

---
 gnu/packages/golang-xyz.scm      | 16 ++++++++--------
 gnu/packages/irc.scm             |  3 +--
 gnu/packages/messaging.scm       |  2 +-
 gnu/packages/version-control.scm |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 25119c5df2..31524a72b2 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -375,25 +375,25 @@ (define-public go-dario-cat-mergo
 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 71735db4dc..7ae3225520 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -1259,7 +1259,7 @@ (define-public soju
                 (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
@@ -1284,4 +1284,3 @@ (define-public soju
 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 26db072b4a..59e3793038 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3729,7 +3729,7 @@ (define-public senpai
                       (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 b40126e34f..e166a9961f 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -4740,7 +4740,7 @@ (define-public hut
     (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
-- 
2.49.0

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

From: Daniel Ziltener <dziltener <at> lyrion.ch>
To: 77660 <at> debbugs.gnu.org
Cc: Daniel Ziltener <dziltener <at> lyrion.ch>
Subject: [PATCH 2/5] gnu: go-git-sr-ht-rockorager-vaxis: Update to 0.13.0.
Date: Wed,  9 Apr 2025 02:14:57 +0200

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

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 31524a72b2..5a3b7ffdac 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -518,7 +518,7 @@ (define-public go-git-sr-ht-rockorager-tcell-term
 (define-public go-git-sr-ht-rockorager-vaxis
   (package
     (name "go-git-sr-ht-rockorager-vaxis")
-    (version "0.9.2")
+    (version "0.13.0")
     (source
      (origin
        (method git-fetch)
@@ -527,7 +527,7 @@ (define-public go-git-sr-ht-rockorager-vaxis
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0pmi4bigqgrfdlk9d6ia3jxgcr4iadiyynf6bny9fdc3yyppcxic"))))
+        (base32 "0lv2ry55a19vym5km6d1rpyhafx2kh0ikcnishkjhyg93i884k52"))))
     (build-system go-build-system)
     (arguments
      (list
-- 
2.49.0

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

From: Daniel Ziltener <dziltener <at> lyrion.ch>
To: 77660 <at> debbugs.gnu.org
Cc: Daniel Ziltener <dziltener <at> lyrion.ch>
Subject: [PATCH 3/5] gnu: senpai: Update to 0.4.0.
Date: Wed,  9 Apr 2025 02:14:58 +0200

---
 gnu/packages/messaging.scm | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 59e3793038..9cbb4ac718 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3692,7 +3692,7 @@ (define-public pn
 (define-public senpai
   (package
     (name "senpai")
-    (version "0.3.0")
+    (version "0.4.0")
     (source
      (origin
        (method git-fetch)
@@ -3702,24 +3702,25 @@ (define-public senpai
          (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0l43qfjr0ggpv1hkyyfxp3j6acrbbrl8n6qxlh91gyb2jan03683"))))
+        (base32 "0hzrkzsi7c3nrarrd09b8cs31r6vdnmjcw3clj7mjm4cp7xp4dfw"))))
     (build-system go-build-system)
     (arguments
-     (list #:import-path "git.sr.ht/~taiite/senpai/cmd/senpai"
-           #:unpack-path "git.sr.ht/~taiite/senpai"
+     (list #:import-path "git.sr.ht/~delthas/senpai/cmd/senpai"
+           #:unpack-path "git.sr.ht/~delthas/senpai"
            #:install-source? #f
            ;; Step away from cmd/senpai to test the whole project.
            #:test-subdirs #~(list "../../...")
            #:phases
-           #~(modify-phases %standard-phases
+           #~(modify-phases
+                 %standard-phases
                (add-after 'build 'build-doc
                  (lambda* (#:key unpack-path #:allow-other-keys)
                    (invoke "make" "doc"
                            "-C" (string-append "src/" unpack-path))))
                (add-after 'install 'install-doc
                  (lambda* (#:key unpack-path #:allow-other-keys)
-                   (let ((man1 (string-append #$output "/share/man/man1"))
-                         (man5 (string-append #$output "/share/man/man5")))
+                   (let ((man1 (string-append #$output "/share/man1"))
+                         (man5 (string-append #$output "/share/man5")))
                      (mkdir-p man1)
                      (mkdir-p man5)
                      (install-file
@@ -3730,13 +3731,17 @@ (define-public senpai
                       man5)))))))
     (native-inputs
      (list go-codeberg-org-emersion-go-scfg
+           go-git-sr-ht-rockorager-vaxis
+           go-github-com-containerd-console
            go-github-com-delthas-go-libnp
            go-github-com-delthas-go-localeinfo
-           go-github-com-delthas-tcell-v2 ; remove in the next release
-           go-github-com-mattn-go-runewidth
+           go-github-com-disintegration-imaging
+           go-github-com-godbus-dbus-v5
+           go-github-com-rivo-uniseg
            go-golang-org-x-net
            go-golang-org-x-time
            go-mvdan-cc-xurls-v2
+           go-github-com-mattn-go-runewidth
            scdoc
            which))
     (home-page "https://sr.ht/~delthas/senpai")
-- 
2.49.0

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

From: Daniel Ziltener <dziltener <at> lyrion.ch>
To: 77660 <at> debbugs.gnu.org
Cc: Daniel Ziltener <dziltener <at> lyrion.ch>
Subject: [PATCH 4/5] gnu: go-github-com-sherclockholmes-webpush-go: Update to
 1.4.0.
Date: Wed,  9 Apr 2025 02:14:59 +0200

---
 gnu/packages/golang-web.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9bac874365..b19a74e448 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -7338,7 +7338,7 @@ (define-public go-github-com-safchain-ethtool
 (define-public go-github-com-sherclockholmes-webpush-go
   (package
     (name "go-github-com-sherclockholmes-webpush-go")
-    (version "1.3.0")
+    (version "1.4.0")
     (source
      (origin
        (method git-fetch)
@@ -7347,13 +7347,13 @@ (define-public go-github-com-sherclockholmes-webpush-go
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0qv16zvkd1c7q81v2ai8pfz590fxdrk4lfbgyymln0q7jn5wlvki"))))
+        (base32 "0dzc2nlxd1lfwr97cqmr4fc792zbsb6yssr7yqxxamqck1y8gnqm"))))
     (build-system go-build-system)
     (arguments
      (list
       #:import-path "github.com/SherClockHolmes/webpush-go"))
     (propagated-inputs
-     (list go-github-com-golang-jwt-jwt go-golang-org-x-crypto))
+     (list go-github-com-golang-jwt-jwt-v5 go-golang-org-x-crypto))
     (home-page "https://github.com/SherClockHolmes/webpush-go")
     (synopsis "Web Push API Encryption with VAPID support")
     (description
-- 
2.49.0

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

From: Daniel Ziltener <dziltener <at> lyrion.ch>
To: 77660 <at> debbugs.gnu.org
Cc: Daniel Ziltener <dziltener <at> lyrion.ch>
Subject: [PATCH 5/5] gnu: soju: Update to 0.9.0.
Date: Wed,  9 Apr 2025 02:15:00 +0200

---
 gnu/packages/irc.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 7ae3225520..590b02fc8b 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -1220,7 +1220,7 @@ (define-public snuik
 (define-public soju
   (package
     (name "soju")
-    (version "0.8.2")
+    (version "0.9.0")
     (source
      (origin
        (method git-fetch)
@@ -1229,7 +1229,7 @@ (define-public soju
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1dk9w87ksjvbhnchyyl4yhdlhjnc9s9hpzhykfiyh935g75zv66c"))))
+        (base32 "09d4h2rchhccrh6qhgqwbv0s1vsfzkmbv3j9f3ayaf9a9ml97d59"))))
     (build-system go-build-system)
     (arguments
      (list
@@ -1262,6 +1262,7 @@ (define-public soju
      (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-sherclockholmes-webpush-go
            go-github-com-coder-websocket
            go-github-com-emersion-go-sasl
            go-github-com-lib-pq
@@ -1269,10 +1270,8 @@ (define-public soju
            go-github-com-msteinert-pam-v2
            go-github-com-pires-go-proxyproto
            go-github-com-prometheus-client-golang
-           go-github-com-sherclockholmes-webpush-go
            go-golang-org-x-crypto
            go-golang-org-x-time
-           go-google-golang-org-protobuf
            go-gopkg-in-irc-v4
            scdoc))
     (home-page "https://soju.im/")
-- 
2.49.0

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

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 77660 <at> debbugs.gnu.org
Cc: dziltener <at> lyrion.ch
Subject: [PATCH 0/5] Update senpai, soju, and dependencies
Date: Wed, 9 Apr 2025 08:49:42 +0100

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

Hi,

Please check go-team branch they are updated there, waiting for
the turn now.

Thanks,
Oleg

VCS: https://github.incerto.xyz/; https://git.sr.ht/~hellseher/
GPG: 9847 81DE 689C 21C2 6418 0867 76D7 27BF F62C D2B5

… наш разум - превосходная объяснительная машина которая способна найти
смысл почти в чем угодно, истолковать любой феномен, но совершенно не в
состоянии принять мысль о непредсказуемости.

[Message part 2 (text/html, inline)]

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

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 77660 <at> debbugs.gnu.org
Cc: dziltener <at> lyrion.ch
Subject: [PATCH 0/5] Update senpai, soju, and dependencies
Date: Wed, 9 Apr 2025 08:59:16 +0100

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

Hi,

I've checked - go-team doesn't contain proposed changes,
will take a look tonight.

Thanks,
Oleg

VCS: https://github.incerto.xyz/; https://git.sr.ht/~hellseher/
GPG: 9847 81DE 689C 21C2 6418 0867 76D7 27BF F62C D2B5

… наш разум - превосходная объяснительная машина которая способна найти
смысл почти в чем угодно, истолковать любой феномен, но совершенно не в
состоянии принять мысль о непредсказуемости.

[Message part 2 (text/html, inline)]

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

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 77660-done <at> debbugs.gnu.org
Subject: [PATCH 0/5] Update senpai, soju, and dependencies
Date: Thu, 10 Apr 2025 21:14:56 +0100

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

Hi,

I've applied them on go-team branch after and adjusted commit message
accordingly to changes.

Both final command have built successfully on x86_64 machine:
--8<---------------cut here---------------start------------->8---
/gnu/store/l8hbf5q114kvb3pyidllzck8gqjq691s-soju-0.9.0
/gnu/store/ypry2k37mjda33mhgqyiiz9nza8s6x5v-senpai-0.4.0
--8<---------------cut here---------------end--------------->8---

go-team is in a queue to be merged hope soon:
<https://issues.guix.gnu.org/76654>.

--
Thanks,
Oleg

[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.