GNU bug report logs - #72505
[PATCH 0/2] Update soju

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 72505 in the body.
You can then email your comments to 72505 AT debbugs.gnu.org in the normal way.

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

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: guix-patches <at> gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 0/2] Update soju
Date: Wed,  7 Aug 2024 07:39:50 +0200

This updates soju and its input go-git-sr-ht-emersion-go-scfg to latest
versions. The only other package depending on the latter is senpai, and
it still builds with the updated input. Thanks!

Timotej Lazar (2):
  gnu: go-git-sr-ht-emersion-go-scfg: Update to
    0.0.0-20240128091534-2ae16e782082.
  gnu: soju: Update to 0.8.1.

 gnu/packages/golang-xyz.scm |  4 ++--
 gnu/packages/irc.scm        | 14 ++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)


base-commit: 5e567587dd4abf51f9a6fa44f5a852dde1115ce9
-- 
2.45.1

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 72505 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 1/2] gnu: go-git-sr-ht-emersion-go-scfg: Update to
 0.0.0-20240128091534-2ae16e782082.
Date: Wed,  7 Aug 2024 07:45:55 +0200

* gnu/packages/golang-xyz.scm (go-git-sr-ht-emersion-go-scfg): Update to 0.0.0-20240128091534-2ae16e782082.

Change-Id: I15b3bd2f1b58689e5fda5140349ef22511e439a1
---
 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 6560f43578..b7eccae55a 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -229,7 +229,7 @@ (define-public go-code-cloudfoundry-org-bytefmt
 (define-public go-git-sr-ht-emersion-go-scfg
   (package
     (name "go-git-sr-ht-emersion-go-scfg")
-    (version "0.0.0-20211215104734-c2c7a15d6c99")
+    (version "0.0.0-20240128091534-2ae16e782082")
     (source
      (origin
        (method git-fetch)
@@ -238,7 +238,7 @@ (define-public go-git-sr-ht-emersion-go-scfg
              (commit (go-version->git-ref version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "02gn8hz8zfv8y0krysx2wv951gw8hmhdfqf1ysidwm7i293365w4"))))
+        (base32 "1gxhg40q4md3lj1wrrnms0jhyqsxhx2hcv6sm5yjbbqana5x26mx"))))
     (build-system go-build-system)
     (arguments
      (list #:import-path "git.sr.ht/~emersion/go-scfg"))
-- 
2.45.1

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

From: Timotej Lazar <timotej.lazar <at> araneo.si>
To: 72505 <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: [PATCH 2/2] gnu: soju: Update to 0.8.1.
Date: Wed,  7 Aug 2024 07:45:56 +0200

Moved to Codeberg, see <https://git.sr.ht/~emersion/soju/commit/6541047>.
The moderncsqlite tag needs modernc.org/sqlite, which is not packaged.

* gnu/packages/irc.scm (soju): Update to 0.8.1.
[source]: Update URL.
[arguments]: Update #:import-path. Drop unused build flag.
[native-inputs]: Use go-github-com-msteinert-pam-v2.

Change-Id: I992d4e786cdabeb25fc65647c5a0b7f079df9460
---
 gnu/packages/irc.scm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index a298a5799c..89be2e2b66 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -1095,21 +1095,21 @@ (define-public snuik
 (define-public soju
   (package
     (name "soju")
-    (version "0.7.0")
+    (version "0.8.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://git.sr.ht/~emersion/soju")
+             (url "https://codeberg.org/emersion/soju")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1a0mp8f5i1ajh67y6fasmzgca3w1ccaiz19sx87rflbyi1mrhdlz"))))
+        (base32 "10qc0g78yhsg6fnnb046jr0s592isw0r0mvydy6frgnx9rxac6k6"))))
     (build-system go-build-system)
     (arguments
      (list
       #:install-source? #f
-      #:import-path "git.sr.ht/~emersion/soju"
+      #:import-path "codeberg.org/emersion/soju"
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'adjust-makefile
@@ -1125,9 +1125,7 @@ (define-public soju
           (replace 'build
             (lambda* (#:key import-path #:allow-other-keys)
               (with-directory-excursion (string-append "src/" import-path)
-                ;; To use an alternative SQLite library that does not require
-                ;; CGO and build with PAM.
-                (setenv "GOFLAGS" "-v -x -trimpath -tags=moderncsqlite -tags=pam")
+                (setenv "GOFLAGS" "-v -x -trimpath -tags=pam")
                 (setenv "SYSCONFDIR" (string-append #$output "/etc"))
                 (invoke "make"))))
           (replace 'install
@@ -1142,7 +1140,7 @@ (define-public soju
            go-github-com-emersion-go-sasl
            go-github-com-lib-pq
            go-github-com-mattn-go-sqlite3
-           go-github-com-msteinert-pam
+           go-github-com-msteinert-pam-v2
            go-github-com-pires-go-proxyproto
            go-github-com-prometheus-client-golang
            go-github-com-sherclockholmes-webpush-go
-- 
2.45.1

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

From: jgart <jgart <at> dismail.de>
To: 72505-done <at> debbugs.gnu.org
Cc: Timotej Lazar <timotej.lazar <at> araneo.si>
Subject: Re: [PATCH 0/2] Update soju
Date: Wed, 07 Aug 2024 22:55:05 -0500

Applied. Thanks for the contribution!
-- 
all the best,
jgart

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.