[bug#71780] [PATCH 0/3] add hydroxide package

[bug#71780] [PATCH 0/3] add hydroxide package

[Jean SIMARD]

hydroxide is a bridge for ProtonMail which expose SMTP and IMAP.
This is useful for example for `git send-email` which needs
SMTP that ProtonMail doesn't provide.

A serie of patches is proposed.
1. first an update of existing `go-sasl`
2. second, an update of existing `protonmail/go-crypto`, note that it also impacts `go-pgpmail`
3. all the new dependencies needed for `hydroxide`, then `hydroxide`

I checked the other dependents of `go-sasl` and `protonmail/go-crypto` which are `soju` and `aerc`.
They appear to build correctly with these new versions of the dependencies.

`go-smtp` is dependency which already exists in `guix`.
However, bumping it was breaking `aerc`.
I therefore chose to make a variant for the newer version.

Jean SIMARD (3):
  gnu: update go-github-com-emersion-go-sasl
  gnu: update go-github-com-protonmail-go-crypto
  gnu: add hydroxide

 gnu/packages/golang-crypto.scm |  51 +++++++---
 gnu/packages/golang.scm        | 177 +++++++++++++++++++++++++++++----
 gnu/packages/mail.scm          |  37 +++++++
 3 files changed, 230 insertions(+), 35 deletions(-)


base-commit: 78d946b01162fbe986c6768800e8cfd6e70e67e5
-- 
2.41.0

[bug#71780] [PATCH 1/3] gnu: update go-github-com-emersion-go-sasl

[Jean SIMARD]

The `let` has been removed which explains the entire
package is differently indented. Only `version`,
`commit` and `hash` have been changed.

Change-Id: I1cac640be1c9edc0cb2b427982d8419ce232ea00
---
 gnu/packages/golang.scm | 42 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 4e3fe5bd10..0b1a16d8e1 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5937,28 +5937,26 @@ (define-public go-github-com-emersion-go-smtp
     (license license:expat)))
 
 (define-public go-github-com-emersion-go-sasl
-  (let ((commit "0b9dcfb154ac3d7515b08bc2691a0332800edfe9")
-        (revision "1"))
-    (package
-      (name "go-github-com-emersion-go-sasl")
-      (version (git-version "0.0.0" revision commit))
-      (source
-        (origin
-          (method git-fetch)
-          (uri (git-reference
-                (url "https://github.com/emersion/go-sasl")
-                (commit commit)))
-          (file-name (git-file-name name version))
-          (sha256
-           (base32
-            "1cbf86wkqrdinfydndgdlnayg4a5mg3d4vqra377j2sfkg7wj0hs"))))
-      (build-system go-build-system)
-      (arguments
-       (list #:import-path "github.com/emersion/go-sasl"))
-      (home-page "https://github.com/emersion/go-sasl")
-      (synopsis "SASL library written in Go")
-      (description "This package provides a SASL library written in Go.")
-      (license license:expat))))
+  (package
+    (name "go-github-com-emersion-go-sasl")
+    (version "0.0.0-20220912192320-0145f2c60ead")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/go-sasl")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "00bkl56zycs3pd1schkxx3swfjixz0lvnzdxkxx9piv99w91v2n4"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/emersion/go-sasl"))
+    (home-page "https://github.com/emersion/go-sasl")
+    (synopsis "SASL library written in Go")
+    (description "This package provides a SASL library written in Go.")
+    (license license:expat)))
 
 (define-public go-github-com-emersion-go-imap-idle
   (let ((commit "2704abd7050ed7f2143753554ee23affdf847bd9")
-- 
2.41.0

[bug#71780] [PATCH 2/3] gnu: update go-github-com-protonmail-go-crypto

[Jean SIMARD]

The package also has been reformatted with `guix style`

Change-Id: I10ede00c5237d23024e1b7fa54980a9f9859f4c0
---
 gnu/packages/golang-crypto.scm | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index baf68b7089..94112973b5 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -378,7 +378,7 @@ (define-public go-github-com-dvsekhvalnov-jose2go
 (define-public go-github-com-emersion-go-pgpmail
   (package
     (name "go-github-com-emersion-go-pgpmail")
-    (version "0.2.0")
+    (version "0.2.1")
     (source
      (origin
        (method git-fetch)
@@ -387,7 +387,7 @@ (define-public go-github-com-emersion-go-pgpmail
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ar26b0apw5bxn58qfn1a79cxigbmrqm1irh1rb7x57fydihc7wm"))))
+        (base32 "1fiqpdwxnfba2cgij7j83dfqc0zz4mq95x15wicgm5f3vjr1xg5h"))))
     (build-system go-build-system)
     (arguments
      (list ;; tests don't support our version of protonmail/go-crypto; see
@@ -961,7 +961,7 @@ (define-public go-github-com-pion-randutil
 (define-public go-github-com-protonmail-go-crypto
   (package
     (name "go-github-com-protonmail-go-crypto")
-    (version "0.0.0-20220623141421-5afb4c282135")
+    (version "0.0.0-20230923063757-afb1ddc0824c")
     (source
      (origin
        (method git-fetch)
@@ -970,20 +970,21 @@ (define-public go-github-com-protonmail-go-crypto
              (commit (go-version->git-ref version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "05qxdbn8wdk901z5kw2r3jdrag58nxlcsy0p8xd6rq0d71sw94wy"))))
+        (base32 "11q94983r6zjrdvflpikms4773a9s5vb9gg4qw1rj5800yhhah0n"))))
     (build-system go-build-system)
     (arguments
-     (list #:import-path "github.com/ProtonMail/go-crypto"
-           #:tests? #f ; Source-only package.
-           #:phases
-           #~(modify-phases %standard-phases
-               ;; Source-only package.
-               (delete 'build))))
-    (propagated-inputs
-     (list go-golang-org-x-crypto))
+     (list
+      #:import-path "github.com/ProtonMail/go-crypto"
+      #:tests? #f ;Source-only package.
+      #:phases #~(modify-phases %standard-phases
+                   ;; Source-only package.
+                   (delete 'build))))
+    (propagated-inputs (list go-golang-org-x-crypto
+                             go-github-com-cloudflare-circl))
     (home-page "https://github.com/ProtonMail/go-crypto")
     (synopsis "Fork of x/crypto with up-to-date OpenPGP implementation")
-    (description "This package provides cryptography for Go.  This version of
+    (description
+     "This package provides cryptography for Go.  This version of
 the package is a fork that adds a more up-to-date OpenPGP implementation.  It
 is completely backwards compatible with @code{golang.org/x/crypto}, the
 official package.")
-- 
2.41.0

[bug#71780] [PATCH 3/3] gnu: add hydroxide

[Jean SIMARD]

Change-Id: Ic94a984da0cd458037f1246a8501f6cb10c19708

Note that `go-github-com-emersion-go-smtp` is already used in an
older version for `aerc`. The newer version, needed for `hydroxide`
does not compile for `aerc`. Therefore, a variant is needed for
`hydroxide`.

Change-Id: Ibb4599e008806afc0f1908baf4b4c54f5e30c059
---
 gnu/packages/golang-crypto.scm |  24 ++++++
 gnu/packages/golang.scm        | 135 +++++++++++++++++++++++++++++++++
 gnu/packages/mail.scm          |  37 +++++++++
 3 files changed, 196 insertions(+)

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 94112973b5..5921acb4f1 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2023 Jack Hill <jackhill@jackhill.us>
 ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
 ;;; Copyright © 2024 Jesse Eisses <jesse@eisses.email>
+;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -375,6 +376,29 @@ (define-public go-github-com-dvsekhvalnov-jose2go
 library.")
     (license license:expat)))
 
+(define-public go-github-com-emersion-go-bcrypt
+  (package
+    (name "go-github-com-emersion-go-bcrypt")
+    (version "0.0.0-20170822072041-6e724a1baa63")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/go-bcrypt")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pchrgs05w30iqbh4d6iys4wvlyajsdwchp5mkf59amgsbyjaqgm"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/emersion/go-bcrypt"))
+    (propagated-inputs (list go-golang-org-x-crypto))
+    (home-page "https://github.com/emersion/go-bcrypt")
+    (synopsis "Extract of bcrypt from golang.org/x/crypto/bcrypt")
+    (description "An extract bcrypt from golang.org/x/crypto/bcrypt.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-emersion-go-pgpmail
   (package
     (name "go-github-com-emersion-go-pgpmail")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 0b1a16d8e1..6e568d8add 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 Jean Simard <woshilapin@tuziwo.info>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5860,6 +5861,32 @@ (define-public go-github-com-ddevault-go-libvterm
        "This is a fork of another go-libvterm library for use with aerc.")
       (license license:expat))))
 
+(define-public go-github-com-boltdb-bolt
+  (package
+    (name "go-github-com-boltdb-bolt")
+    (version "1.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/boltdb/bolt")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/boltdb/bolt"
+      #:tests? #f))
+    (home-page "https://github.com/boltdb/bolt")
+    (synopsis "Pure Go key/value store inspired by Howard Chu's LMDB project")
+    (description
+     "Bolt is a pure Go key/value store inspired by Howard Chu's LMDB project.
+     The goal of the project is to provide a simple, fast, and reliable database
+     for projects that don't require a full database server such as Postgres or MySQL.")
+    (license license:expat)))
+
 (define-public go-github-com-emersion-go-imap
   (package
     (name "go-github-com-emersion-go-imap")
@@ -5936,6 +5963,21 @@ (define-public go-github-com-emersion-go-smtp
 defined by RFC 5321.")
     (license license:expat)))
 
+(define-public go-github-com-emersion-go-smtp-v0.18
+  (package
+    (inherit go-github-com-emersion-go-smtp)
+    (name "go-github-com-emersion-go-smtp")
+    (version "0.18.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/go-smtp")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1d17gmz88cnfld8y1j2jsmldhvg8czbdmrjis0ls9zi7rfqlmnra"))))))
+
 (define-public go-github-com-emersion-go-sasl
   (package
     (name "go-github-com-emersion-go-sasl")
@@ -6085,6 +6127,99 @@ (define-public go-github-com-emersion-go-mbox
 @code{mbox} files.")
     (license license:expat)))
 
+(define-public go-github-com-emersion-go-vcard
+  (package
+    (name "go-github-com-emersion-go-vcard")
+    (version "0.0.0-20230815062825-8fda7d206ec9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/go-vcard")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "12n5jinj5xzdfl9jhqvjbzxvj32bw310mdw4q5rjv35pk566zixl"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/emersion/go-vcard"))
+    (home-page "https://github.com/emersion/go-vcard")
+    (synopsis "Go library to parse and format vCard")
+    (description "A Go library to parse and format vCard.")
+    (license license:expat)))
+
+(define-public go-github-com-teambition-rrule-go
+  (package
+    (name "go-github-com-teambition-rrule-go")
+    (version "1.8.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/teambition/rrule-go")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1fnbava35w9z60carny5b7whd4nkv6hrf9g43wwg8d88gfij9zj2"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/teambition/rrule-go"))
+    (home-page "https://github.com/teambition/rrule-go")
+    (synopsis
+     "Go library for working with recurrence rules for calendar dates")
+    (description
+     "A go library for working with recurrence rules for calendar dates.")
+    (license license:expat)))
+
+(define-public go-github-com-emersion-go-ical
+  (package
+    (name "go-github-com-emersion-go-ical")
+    (version "0.0.0-20240127095438-fc1c9d8fb2b6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/go-ical")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "01cn9kggkdalb6xp2nrka01gs40zs8v6h5bq8d2m8wrdcsy5b36v"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/emersion/go-ical"))
+    (propagated-inputs (list go-github-com-teambition-rrule-go))
+    (home-page "https://github.com/emersion/go-ical")
+    (synopsis "Go library for iCalendar")
+    (description "An iCalendar library for Go.")
+    (license license:expat)))
+
+(define-public go-github-com-emersion-go-webdav
+  (package
+    (name "go-github-com-emersion-go-webdav")
+    (version "v0.3.2-0.20220524091811-5d845721d8f7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/go-webdav")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1vxf9k7m4lxsyry374bm4y34d2sb2ssy0c45mb1vchdfhffgyj9i"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/emersion/go-webdav"))
+    (propagated-inputs (list go-github-com-emersion-go-ical
+                             go-github-com-emersion-go-vcard))
+    (home-page "https://github.com/emersion/go-webdav")
+    (synopsis "Go library for WebDAV, CalDAV and CardDAV")
+    (description "A Go library for WebDAV, CalDAV and CardDAV.")
+    (license license:expat)))
+
 (define-public go-github-com-google-go-cmp-cmp
   (package
     (name "go-github-com-google-go-cmp-cmp")
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index de6d21e7cc..dd813baef6 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -56,6 +56,7 @@
 ;;; Copyright © 2023 Arjan Adriaanse <arjan@adriaan.se>
 ;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
 ;;; Copyright © 2024 Benjamin Slade <slade@lambda-y.net>
+;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5121,3 +5122,39 @@ (define-public aerc
     ;; <https://lists.sr.ht/~rjarry/aerc-devel/%3Cb5cb213a7d0c699a886971658c2476
     ;; 1073eb2391%40disroot.org%3E>
     (license license:gpl3+)))
+
+(define-public hydroxide
+  (package
+    (name "hydroxide")
+    (version "0.2.28")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/hydroxide")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1a7qga9qxwcdjimra9d9jnkds1iwh2sqk6241p4di6awli9zksv1"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/emersion/hydroxide/cmd/hydroxide"
+      #:unpack-path "github.com/emersion/hydroxide"))
+    (inputs (list go-github-com-protonmail-go-crypto
+                  go-github-com-boltdb-bolt
+                  go-github-com-emersion-go-bcrypt
+                  go-github-com-emersion-go-imap
+                  go-github-com-emersion-go-mbox
+                  go-github-com-emersion-go-message
+                  go-github-com-emersion-go-smtp-v0.18
+                  go-github-com-emersion-go-vcard
+                  go-github-com-emersion-go-webdav
+                  go-golang-org-x-crypto
+                  go-golang-org-x-term))
+    (home-page "https://github.com/emersion/hydroxide")
+    (synopsis "Third-party, open-source ProtonMail bridge")
+    (description "A third-party, open-source ProtonMail bridge.
+     For power users only, designed to run on a server.
+     hydroxide supports CardDAV, IMAP and SMTP.")
+    (license license:expat)))
-- 
2.41.0

[bug#71780] [PATCH 3/3] gnu: add hydroxide

[woshilapin]

Hi Oleg,

Thank you for your answer. I was not aware of that other issue, should have done my due diligence to search for it.

That said, this other issue is a year and a half old, with no activity so far. It's an outdated version of 'hydroxide' and some of its dependencies. Therefore, I'm not sure how to proceed from here. It seems a lot was depending on 'aerc' to be merged first in 'guix', which is now the case. And indeed, a substantial part of the dependencies are shared between 'aerc' and 'hydroxide'. Would it make sense to look at the new patches instead of trying to move forward on the older issue?

Note: I didn't receive your email since you only replied to the debbugs address. That explains why I didn't answer sooner.

Sincerely,
--
Jean SIMARD aka woshilapin

Le mercredi 26 juin 2024 à 09:33, Jean SIMARD <woshilapin@tuziwo.info> a écrit :

> Change-Id: Ic94a984da0cd458037f1246a8501f6cb10c19708
> 
> Note that `go-github-com-emersion-go-smtp` is already used in an
> older version for `aerc`. The newer version, needed for `hydroxide`
> does not compile for `aerc`. Therefore, a variant is needed for
> `hydroxide`.
> 
> Change-Id: Ibb4599e008806afc0f1908baf4b4c54f5e30c059
> ---
> gnu/packages/golang-crypto.scm | 24 ++++++
> gnu/packages/golang.scm | 135 +++++++++++++++++++++++++++++++++
> gnu/packages/mail.scm | 37 +++++++++
> 3 files changed, 196 insertions(+)
> 
> diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
> index 94112973b5..5921acb4f1 100644
> --- a/gnu/packages/golang-crypto.scm
> +++ b/gnu/packages/golang-crypto.scm
> @@ -21,6 +21,7 @@
> ;;; Copyright © 2023 Jack Hill jackhill@jackhill.us
> 
> ;;; Copyright © 2024 Troy Figiel troy@troyfigiel.com
> 
> ;;; Copyright © 2024 Jesse Eisses jesse@eisses.email
> 
> +;;; Copyright © 2024 Jean Simard woshilapin@tuziwo.info
> 
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -375,6 +376,29 @@ (define-public go-github-com-dvsekhvalnov-jose2go
> library.")
> (license license:expat)))
> 
> +(define-public go-github-com-emersion-go-bcrypt
> + (package
> + (name "go-github-com-emersion-go-bcrypt")
> + (version "0.0.0-20170822072041-6e724a1baa63")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/emersion/go-bcrypt")
> + (commit (go-version->git-ref version))))
> 
> + (file-name (git-file-name name version))
> + (sha256
> + (base32 "1pchrgs05w30iqbh4d6iys4wvlyajsdwchp5mkf59amgsbyjaqgm"))))
> + (build-system go-build-system)
> + (arguments
> + (list
> + #:import-path "github.com/emersion/go-bcrypt"))
> + (propagated-inputs (list go-golang-org-x-crypto))
> + (home-page "https://github.com/emersion/go-bcrypt")
> + (synopsis "Extract of bcrypt from golang.org/x/crypto/bcrypt")
> + (description "An extract bcrypt from golang.org/x/crypto/bcrypt.")
> + (license license:bsd-3)))
> +
> (define-public go-github-com-emersion-go-pgpmail
> (package
> (name "go-github-com-emersion-go-pgpmail")
> diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
> index 0b1a16d8e1..6e568d8add 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 Jean Simard woshilapin@tuziwo.info
> 
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -5860,6 +5861,32 @@ (define-public go-github-com-ddevault-go-libvterm
> "This is a fork of another go-libvterm library for use with aerc.")
> (license license:expat))))
> 
> +(define-public go-github-com-boltdb-bolt
> + (package
> + (name "go-github-com-boltdb-bolt")
> + (version "1.3.1")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/boltdb/bolt")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32 "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"))))
> + (build-system go-build-system)
> + (arguments
> + (list
> + #:import-path "github.com/boltdb/bolt"
> + #:tests? #f))
> + (home-page "https://github.com/boltdb/bolt")
> + (synopsis "Pure Go key/value store inspired by Howard Chu's LMDB project")
> + (description
> + "Bolt is a pure Go key/value store inspired by Howard Chu's LMDB project.
> + The goal of the project is to provide a simple, fast, and reliable database
> + for projects that don't require a full database server such as Postgres or MySQL.")
> + (license license:expat)))
> +
> (define-public go-github-com-emersion-go-imap
> (package
> (name "go-github-com-emersion-go-imap")
> @@ -5936,6 +5963,21 @@ (define-public go-github-com-emersion-go-smtp
> defined by RFC 5321.")
> (license license:expat)))
> 
> +(define-public go-github-com-emersion-go-smtp-v0.18
> + (package
> + (inherit go-github-com-emersion-go-smtp)
> + (name "go-github-com-emersion-go-smtp")
> + (version "0.18.0")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/emersion/go-smtp")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32 "1d17gmz88cnfld8y1j2jsmldhvg8czbdmrjis0ls9zi7rfqlmnra"))))))
> +
> (define-public go-github-com-emersion-go-sasl
> (package
> (name "go-github-com-emersion-go-sasl")
> @@ -6085,6 +6127,99 @@ (define-public go-github-com-emersion-go-mbox
> @code{mbox} files.")
> (license license:expat)))
> 
> +(define-public go-github-com-emersion-go-vcard
> + (package
> + (name "go-github-com-emersion-go-vcard")
> + (version "0.0.0-20230815062825-8fda7d206ec9")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/emersion/go-vcard")
> + (commit (go-version->git-ref version))))
> 
> + (file-name (git-file-name name version))
> + (sha256
> + (base32 "12n5jinj5xzdfl9jhqvjbzxvj32bw310mdw4q5rjv35pk566zixl"))))
> + (build-system go-build-system)
> + (arguments
> + (list
> + #:import-path "github.com/emersion/go-vcard"))
> + (home-page "https://github.com/emersion/go-vcard")
> + (synopsis "Go library to parse and format vCard")
> + (description "A Go library to parse and format vCard.")
> + (license license:expat)))
> +
> +(define-public go-github-com-teambition-rrule-go
> + (package
> + (name "go-github-com-teambition-rrule-go")
> + (version "1.8.2")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/teambition/rrule-go")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32 "1fnbava35w9z60carny5b7whd4nkv6hrf9g43wwg8d88gfij9zj2"))))
> + (build-system go-build-system)
> + (arguments
> + (list
> + #:import-path "github.com/teambition/rrule-go"))
> + (home-page "https://github.com/teambition/rrule-go")
> + (synopsis
> + "Go library for working with recurrence rules for calendar dates")
> + (description
> + "A go library for working with recurrence rules for calendar dates.")
> + (license license:expat)))
> +
> +(define-public go-github-com-emersion-go-ical
> + (package
> + (name "go-github-com-emersion-go-ical")
> + (version "0.0.0-20240127095438-fc1c9d8fb2b6")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/emersion/go-ical")
> + (commit (go-version->git-ref version))))
> 
> + (file-name (git-file-name name version))
> + (sha256
> + (base32 "01cn9kggkdalb6xp2nrka01gs40zs8v6h5bq8d2m8wrdcsy5b36v"))))
> + (build-system go-build-system)
> + (arguments
> + (list
> + #:import-path "github.com/emersion/go-ical"))
> + (propagated-inputs (list go-github-com-teambition-rrule-go))
> + (home-page "https://github.com/emersion/go-ical")
> + (synopsis "Go library for iCalendar")
> + (description "An iCalendar library for Go.")
> + (license license:expat)))
> +
> +(define-public go-github-com-emersion-go-webdav
> + (package
> + (name "go-github-com-emersion-go-webdav")
> + (version "v0.3.2-0.20220524091811-5d845721d8f7")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/emersion/go-webdav")
> + (commit (go-version->git-ref version))))
> 
> + (file-name (git-file-name name version))
> + (sha256
> + (base32 "1vxf9k7m4lxsyry374bm4y34d2sb2ssy0c45mb1vchdfhffgyj9i"))))
> + (build-system go-build-system)
> + (arguments
> + (list
> + #:import-path "github.com/emersion/go-webdav"))
> + (propagated-inputs (list go-github-com-emersion-go-ical
> + go-github-com-emersion-go-vcard))
> + (home-page "https://github.com/emersion/go-webdav")
> + (synopsis "Go library for WebDAV, CalDAV and CardDAV")
> + (description "A Go library for WebDAV, CalDAV and CardDAV.")
> + (license license:expat)))
> +
> (define-public go-github-com-google-go-cmp-cmp
> (package
> (name "go-github-com-google-go-cmp-cmp")
> diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
> index de6d21e7cc..dd813baef6 100644
> --- a/gnu/packages/mail.scm
> +++ b/gnu/packages/mail.scm
> @@ -56,6 +56,7 @@
> ;;; Copyright © 2023 Arjan Adriaanse arjan@adriaan.se
> 
> ;;; Copyright © 2023 Wilko Meyer w@wmeyer.eu
> 
> ;;; Copyright © 2024 Benjamin Slade slade@lambda-y.net
> 
> +;;; Copyright © 2024 Jean Simard woshilapin@tuziwo.info
> 
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -5121,3 +5122,39 @@ (define-public aerc
> ;; <https://lists.sr.ht/~rjarry/aerc-devel/<b5cb213a7d0c699a886971658c2476
> ;; 1073eb2391%40disroot.org%3E>
> 
> (license license:gpl3+)))
> +
> +(define-public hydroxide
> + (package
> + (name "hydroxide")
> + (version "0.2.28")
> + (source
> + (origin
> + (method git-fetch)
> + (uri (git-reference
> + (url "https://github.com/emersion/hydroxide")
> + (commit (string-append "v" version))))
> + (file-name (git-file-name name version))
> + (sha256
> + (base32 "1a7qga9qxwcdjimra9d9jnkds1iwh2sqk6241p4di6awli9zksv1"))))
> + (build-system go-build-system)
> + (arguments
> + (list
> + #:import-path "github.com/emersion/hydroxide/cmd/hydroxide"
> + #:unpack-path "github.com/emersion/hydroxide"))
> + (inputs (list go-github-com-protonmail-go-crypto
> + go-github-com-boltdb-bolt
> + go-github-com-emersion-go-bcrypt
> + go-github-com-emersion-go-imap
> + go-github-com-emersion-go-mbox
> + go-github-com-emersion-go-message
> + go-github-com-emersion-go-smtp-v0.18
> + go-github-com-emersion-go-vcard
> + go-github-com-emersion-go-webdav
> + go-golang-org-x-crypto
> + go-golang-org-x-term))
> + (home-page "https://github.com/emersion/hydroxide")
> + (synopsis "Third-party, open-source ProtonMail bridge")
> + (description "A third-party, open-source ProtonMail bridge.
> + For power users only, designed to run on a server.
> + hydroxide supports CardDAV, IMAP and SMTP.")
> + (license license:expat)))
> --
> 2.41.0

[bug#71780] [PATCH 3/3] gnu: add hydroxide

[Sharlatan Hellseher]

Hi Jean,

Sure, I get your reasoning about dated patches. I would prefere yours over older
one to start with. One thing to mention after the first look at your patches:
you combined all new packages as a single commit (patch). May you split
package-per-commit (patch) and send as a series of them please? You many use
etc/commiter.scm script to prepare commits.

See the documentation for more details
https://guix.gnu.org/manual/en/manual/devel/en/html_node/Submitting-Patches.html

--
Oleg

On Sat, 29 Jun 2024 at 13:53, woshilapin <woshilapin@tuziwo.info> wrote:
>
> Hi Oleg,
>
> Thank you for your answer. I was not aware of that other issue, should have done my due diligence to search for it.
>
> That said, this other issue is a year and a half old, with no activity so far. It's an outdated version of 'hydroxide' and some of its dependencies. Therefore, I'm not sure how to proceed from here. It seems a lot was depending on 'aerc' to be merged first in 'guix', which is now the case. And indeed, a substantial part of the dependencies are shared between 'aerc' and 'hydroxide'. Would it make sense to look at the new patches instead of trying to move forward on the older issue?
>
> Note: I didn't receive your email since you only replied to the debbugs address. That explains why I didn't answer sooner.
>
> Sincerely,
> --
> Jean SIMARD aka woshilapin
>
> Le mercredi 26 juin 2024 à 09:33, Jean SIMARD <woshilapin@tuziwo.info> a écrit :
>
> > Change-Id: Ic94a984da0cd458037f1246a8501f6cb10c19708
> >
> > Note that `go-github-com-emersion-go-smtp` is already used in an
> > older version for `aerc`. The newer version, needed for `hydroxide`
> > does not compile for `aerc`. Therefore, a variant is needed for
> > `hydroxide`.
> >
> > Change-Id: Ibb4599e008806afc0f1908baf4b4c54f5e30c059
> > ---
> > gnu/packages/golang-crypto.scm | 24 ++++++
> > gnu/packages/golang.scm | 135 +++++++++++++++++++++++++++++++++
> > gnu/packages/mail.scm | 37 +++++++++
> > 3 files changed, 196 insertions(+)
> >
> > diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
> > index 94112973b5..5921acb4f1 100644
> > --- a/gnu/packages/golang-crypto.scm
> > +++ b/gnu/packages/golang-crypto.scm
> > @@ -21,6 +21,7 @@
> > ;;; Copyright © 2023 Jack Hill jackhill@jackhill.us
> >
> > ;;; Copyright © 2024 Troy Figiel troy@troyfigiel.com
> >
> > ;;; Copyright © 2024 Jesse Eisses jesse@eisses.email
> >
> > +;;; Copyright © 2024 Jean Simard woshilapin@tuziwo.info
> >
> > ;;;
> > ;;; This file is part of GNU Guix.
> > ;;;
> > @@ -375,6 +376,29 @@ (define-public go-github-com-dvsekhvalnov-jose2go
> > library.")
> > (license license:expat)))
> >
> > +(define-public go-github-com-emersion-go-bcrypt
> > + (package
> > + (name "go-github-com-emersion-go-bcrypt")
> > + (version "0.0.0-20170822072041-6e724a1baa63")
> > + (source
> > + (origin
> > + (method git-fetch)
> > + (uri (git-reference
> > + (url "https://github.com/emersion/go-bcrypt")
> > + (commit (go-version->git-ref version))))
> >
> > + (file-name (git-file-name name version))
> > + (sha256
> > + (base32 "1pchrgs05w30iqbh4d6iys4wvlyajsdwchp5mkf59amgsbyjaqgm"))))
> > + (build-system go-build-system)
> > + (arguments
> > + (list
> > + #:import-path "github.com/emersion/go-bcrypt"))
> > + (propagated-inputs (list go-golang-org-x-crypto))
> > + (home-page "https://github.com/emersion/go-bcrypt")
> > + (synopsis "Extract of bcrypt from golang.org/x/crypto/bcrypt")
> > + (description "An extract bcrypt from golang.org/x/crypto/bcrypt.")
> > + (license license:bsd-3)))
> > +
> > (define-public go-github-com-emersion-go-pgpmail
> > (package
> > (name "go-github-com-emersion-go-pgpmail")
> > diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
> > index 0b1a16d8e1..6e568d8add 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 Jean Simard woshilapin@tuziwo.info
> >
> > ;;;
> > ;;; This file is part of GNU Guix.
> > ;;;
> > @@ -5860,6 +5861,32 @@ (define-public go-github-com-ddevault-go-libvterm
> > "This is a fork of another go-libvterm library for use with aerc.")
> > (license license:expat))))
> >
> > +(define-public go-github-com-boltdb-bolt
> > + (package
> > + (name "go-github-com-boltdb-bolt")
> > + (version "1.3.1")
> > + (source
> > + (origin
> > + (method git-fetch)
> > + (uri (git-reference
> > + (url "https://github.com/boltdb/bolt")
> > + (commit (string-append "v" version))))
> > + (file-name (git-file-name name version))
> > + (sha256
> > + (base32 "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"))))
> > + (build-system go-build-system)
> > + (arguments
> > + (list
> > + #:import-path "github.com/boltdb/bolt"
> > + #:tests? #f))
> > + (home-page "https://github.com/boltdb/bolt")
> > + (synopsis "Pure Go key/value store inspired by Howard Chu's LMDB project")
> > + (description
> > + "Bolt is a pure Go key/value store inspired by Howard Chu's LMDB project.
> > + The goal of the project is to provide a simple, fast, and reliable database
> > + for projects that don't require a full database server such as Postgres or MySQL.")
> > + (license license:expat)))
> > +
> > (define-public go-github-com-emersion-go-imap
> > (package
> > (name "go-github-com-emersion-go-imap")
> > @@ -5936,6 +5963,21 @@ (define-public go-github-com-emersion-go-smtp
> > defined by RFC 5321.")
> > (license license:expat)))
> >
> > +(define-public go-github-com-emersion-go-smtp-v0.18
> > + (package
> > + (inherit go-github-com-emersion-go-smtp)
> > + (name "go-github-com-emersion-go-smtp")
> > + (version "0.18.0")
> > + (source
> > + (origin
> > + (method git-fetch)
> > + (uri (git-reference
> > + (url "https://github.com/emersion/go-smtp")
> > + (commit (string-append "v" version))))
> > + (file-name (git-file-name name version))
> > + (sha256
> > + (base32 "1d17gmz88cnfld8y1j2jsmldhvg8czbdmrjis0ls9zi7rfqlmnra"))))))
> > +
> > (define-public go-github-com-emersion-go-sasl
> > (package
> > (name "go-github-com-emersion-go-sasl")
> > @@ -6085,6 +6127,99 @@ (define-public go-github-com-emersion-go-mbox
> > @code{mbox} files.")
> > (license license:expat)))
> >
> > +(define-public go-github-com-emersion-go-vcard
> > + (package
> > + (name "go-github-com-emersion-go-vcard")
> > + (version "0.0.0-20230815062825-8fda7d206ec9")
> > + (source
> > + (origin
> > + (method git-fetch)
> > + (uri (git-reference
> > + (url "https://github.com/emersion/go-vcard")
> > + (commit (go-version->git-ref version))))
> >
> > + (file-name (git-file-name name version))
> > + (sha256
> > + (base32 "12n5jinj5xzdfl9jhqvjbzxvj32bw310mdw4q5rjv35pk566zixl"))))
> > + (build-system go-build-system)
> > + (arguments
> > + (list
> > + #:import-path "github.com/emersion/go-vcard"))
> > + (home-page "https://github.com/emersion/go-vcard")
> > + (synopsis "Go library to parse and format vCard")
> > + (description "A Go library to parse and format vCard.")
> > + (license license:expat)))
> > +
> > +(define-public go-github-com-teambition-rrule-go
> > + (package
> > + (name "go-github-com-teambition-rrule-go")
> > + (version "1.8.2")
> > + (source
> > + (origin
> > + (method git-fetch)
> > + (uri (git-reference
> > + (url "https://github.com/teambition/rrule-go")
> > + (commit (string-append "v" version))))
> > + (file-name (git-file-name name version))
> > + (sha256
> > + (base32 "1fnbava35w9z60carny5b7whd4nkv6hrf9g43wwg8d88gfij9zj2"))))
> > + (build-system go-build-system)
> > + (arguments
> > + (list
> > + #:import-path "github.com/teambition/rrule-go"))
> > + (home-page "https://github.com/teambition/rrule-go")
> > + (synopsis
> > + "Go library for working with recurrence rules for calendar dates")
> > + (description
> > + "A go library for working with recurrence rules for calendar dates.")
> > + (license license:expat)))
> > +
> > +(define-public go-github-com-emersion-go-ical
> > + (package
> > + (name "go-github-com-emersion-go-ical")
> > + (version "0.0.0-20240127095438-fc1c9d8fb2b6")
> > + (source
> > + (origin
> > + (method git-fetch)
> > + (uri (git-reference
> > + (url "https://github.com/emersion/go-ical")
> > + (commit (go-version->git-ref version))))
> >
> > + (file-name (git-file-name name version))
> > + (sha256
> > + (base32 "01cn9kggkdalb6xp2nrka01gs40zs8v6h5bq8d2m8wrdcsy5b36v"))))
> > + (build-system go-build-system)
> > + (arguments
> > + (list
> > + #:import-path "github.com/emersion/go-ical"))
> > + (propagated-inputs (list go-github-com-teambition-rrule-go))
> > + (home-page "https://github.com/emersion/go-ical")
> > + (synopsis "Go library for iCalendar")
> > + (description "An iCalendar library for Go.")
> > + (license license:expat)))
> > +
> > +(define-public go-github-com-emersion-go-webdav
> > + (package
> > + (name "go-github-com-emersion-go-webdav")
> > + (version "v0.3.2-0.20220524091811-5d845721d8f7")
> > + (source
> > + (origin
> > + (method git-fetch)
> > + (uri (git-reference
> > + (url "https://github.com/emersion/go-webdav")
> > + (commit (go-version->git-ref version))))
> >
> > + (file-name (git-file-name name version))
> > + (sha256
> > + (base32 "1vxf9k7m4lxsyry374bm4y34d2sb2ssy0c45mb1vchdfhffgyj9i"))))
> > + (build-system go-build-system)
> > + (arguments
> > + (list
> > + #:import-path "github.com/emersion/go-webdav"))
> > + (propagated-inputs (list go-github-com-emersion-go-ical
> > + go-github-com-emersion-go-vcard))
> > + (home-page "https://github.com/emersion/go-webdav")
> > + (synopsis "Go library for WebDAV, CalDAV and CardDAV")
> > + (description "A Go library for WebDAV, CalDAV and CardDAV.")
> > + (license license:expat)))
> > +
> > (define-public go-github-com-google-go-cmp-cmp
> > (package
> > (name "go-github-com-google-go-cmp-cmp")
> > diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
> > index de6d21e7cc..dd813baef6 100644
> > --- a/gnu/packages/mail.scm
> > +++ b/gnu/packages/mail.scm
> > @@ -56,6 +56,7 @@
> > ;;; Copyright © 2023 Arjan Adriaanse arjan@adriaan.se
> >
> > ;;; Copyright © 2023 Wilko Meyer w@wmeyer.eu
> >
> > ;;; Copyright © 2024 Benjamin Slade slade@lambda-y.net
> >
> > +;;; Copyright © 2024 Jean Simard woshilapin@tuziwo.info
> >
> > ;;;
> > ;;; This file is part of GNU Guix.
> > ;;;
> > @@ -5121,3 +5122,39 @@ (define-public aerc
> > ;; <https://lists.sr.ht/~rjarry/aerc-devel/<b5cb213a7d0c699a886971658c2476
> > ;; 1073eb2391%40disroot.org%3E>
> >
> > (license license:gpl3+)))
> > +
> > +(define-public hydroxide
> > + (package
> > + (name "hydroxide")
> > + (version "0.2.28")
> > + (source
> > + (origin
> > + (method git-fetch)
> > + (uri (git-reference
> > + (url "https://github.com/emersion/hydroxide")
> > + (commit (string-append "v" version))))
> > + (file-name (git-file-name name version))
> > + (sha256
> > + (base32 "1a7qga9qxwcdjimra9d9jnkds1iwh2sqk6241p4di6awli9zksv1"))))
> > + (build-system go-build-system)
> > + (arguments
> > + (list
> > + #:import-path "github.com/emersion/hydroxide/cmd/hydroxide"
> > + #:unpack-path "github.com/emersion/hydroxide"))
> > + (inputs (list go-github-com-protonmail-go-crypto
> > + go-github-com-boltdb-bolt
> > + go-github-com-emersion-go-bcrypt
> > + go-github-com-emersion-go-imap
> > + go-github-com-emersion-go-mbox
> > + go-github-com-emersion-go-message
> > + go-github-com-emersion-go-smtp-v0.18
> > + go-github-com-emersion-go-vcard
> > + go-github-com-emersion-go-webdav
> > + go-golang-org-x-crypto
> > + go-golang-org-x-term))
> > + (home-page "https://github.com/emersion/hydroxide")
> > + (synopsis "Third-party, open-source ProtonMail bridge")
> > + (description "A third-party, open-source ProtonMail bridge.
> > + For power users only, designed to run on a server.
> > + hydroxide supports CardDAV, IMAP and SMTP.")
> > + (license license:expat)))
> > --
> > 2.41.0



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

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

[bug#71780] [PATCH 0/3] add hydroxide package

[Sharlatan Hellseher]

[-- Attachment #1: Type: text/plain, Size: 70 bytes --]

Hi,

Please take a look at https://issues.guix.gnu.org/57326

--
Oleg

[-- Attachment #2: Type: text/html, Size: 255 bytes --]

[bug#71780] [PATCH v2 1/7] gnu: go-github-com-emersion-go-pgpmail: Update to 0.2.1.

[Jean SIMARD]

* gnu/packages/golang-crypto.scm (go-github-com-emersion-go-pgpmail): Update to 0.2.1.

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

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index ddeb79badf..bf9618fca4 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -414,7 +414,7 @@ (define-public go-github-com-dvsekhvalnov-jose2go
 (define-public go-github-com-emersion-go-pgpmail
   (package
     (name "go-github-com-emersion-go-pgpmail")
-    (version "0.2.0")
+    (version "0.2.1")
     (source
      (origin
        (method git-fetch)
@@ -423,7 +423,7 @@ (define-public go-github-com-emersion-go-pgpmail
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ar26b0apw5bxn58qfn1a79cxigbmrqm1irh1rb7x57fydihc7wm"))))
+        (base32 "1fiqpdwxnfba2cgij7j83dfqc0zz4mq95x15wicgm5f3vjr1xg5h"))))
     (build-system go-build-system)
     (arguments
      (list ;; tests don't support our version of protonmail/go-crypto; see

base-commit: f3689976da3d23b0a73cf1733da04add5e1035ee
-- 
2.41.0

[bug#71780] [PATCH v2 2/7] gnu: go-github-com-protonmail-go-crypto: Update to 0.0.0-20230923063757-afb1ddc0824c.

[Jean SIMARD]

* gnu/packages/golang-crypto.scm (go-github-com-protonmail-go-crypto): Update to 0.0.0-20230923063757-afb1ddc0824c.
[inputs]: Add go-github-com-cloudflare-circl.
[format]: Apply 'guix style' to the package

Change-Id: I775c32f7da0e1983c085ddaf24f7767909bdaebc
---
 gnu/packages/golang-crypto.scm | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index bf9618fca4..998a1090b2 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -1021,7 +1021,7 @@ (define-public go-github-com-pion-randutil
 (define-public go-github-com-protonmail-go-crypto
   (package
     (name "go-github-com-protonmail-go-crypto")
-    (version "0.0.0-20220623141421-5afb4c282135")
+    (version "0.0.0-20230923063757-afb1ddc0824c")
     (source
      (origin
        (method git-fetch)
@@ -1030,20 +1030,21 @@ (define-public go-github-com-protonmail-go-crypto
              (commit (go-version->git-ref version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "05qxdbn8wdk901z5kw2r3jdrag58nxlcsy0p8xd6rq0d71sw94wy"))))
+        (base32 "11q94983r6zjrdvflpikms4773a9s5vb9gg4qw1rj5800yhhah0n"))))
     (build-system go-build-system)
     (arguments
-     (list #:import-path "github.com/ProtonMail/go-crypto"
-           #:tests? #f ; Source-only package.
-           #:phases
-           #~(modify-phases %standard-phases
-               ;; Source-only package.
-               (delete 'build))))
-    (propagated-inputs
-     (list go-golang-org-x-crypto))
+     (list
+      #:import-path "github.com/ProtonMail/go-crypto"
+      #:tests? #f ;Source-only package.
+      #:phases #~(modify-phases %standard-phases
+                   ;; Source-only package.
+                   (delete 'build))))
+    (propagated-inputs (list go-golang-org-x-crypto
+                             go-github-com-cloudflare-circl))
     (home-page "https://github.com/ProtonMail/go-crypto")
     (synopsis "Fork of x/crypto with up-to-date OpenPGP implementation")
-    (description "This package provides cryptography for Go.  This version of
+    (description
+     "This package provides cryptography for Go.  This version of
 the package is a fork that adds a more up-to-date OpenPGP implementation.  It
 is completely backwards compatible with @code{golang.org/x/crypto}, the
 official package.")
-- 
2.41.0

[bug#71780] [PATCH v2 3/7] gnu: Add go-github-com-boltdb-bolt.

[Jean SIMARD]

* gnu/packages/golang.scm (go-github-com-boltdb-bolt): New variable.

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

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index d9145e9ac4..3daf97ec92 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -46,6 +46,7 @@
 ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
 ;;; Copyright © 2024 Greg Hogan <code@greghogan.com>
 ;;; Copyright © 2024 Brennan Vincent <brennan@umanwizard.com>
+;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5731,6 +5732,32 @@ (define-public go-github-com-ddevault-go-libvterm
        "This is a fork of another go-libvterm library for use with aerc.")
       (license license:expat))))
 
+(define-public go-github-com-boltdb-bolt
+  (package
+    (name "go-github-com-boltdb-bolt")
+    (version "1.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/boltdb/bolt")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/boltdb/bolt"
+      #:tests? #f))
+    (home-page "https://github.com/boltdb/bolt")
+    (synopsis "Pure Go key/value store inspired by Howard Chu's LMDB project")
+    (description
+     "Bolt is a pure Go key/value store inspired by Howard Chu's LMDB project.
+     The goal of the project is to provide a simple, fast, and reliable database
+     for projects that don't require a full database server such as Postgres or MySQL.")
+    (license license:expat)))
+
 (define-public go-github-com-emersion-go-imap
   (package
     (name "go-github-com-emersion-go-imap")
-- 
2.41.0

[bug#71780] [PATCH v2 4/7] gnu: Add go-github-com-emersion-go-bcrypt.

[Jean SIMARD]

* gnu/packages/golang-crypto.scm (go-github-com-emersion-go-bcrypt): New variable.

Change-Id: Ib627f26eebe1e530668d5b8f971d082fb0ebbe77
---
 gnu/packages/golang-crypto.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index 998a1090b2..ecf75400cb 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -21,6 +21,7 @@
 ;;; Copyright © 2023, 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2024 Jesse Eisses <jesse@eisses.email>
 ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
+;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -411,6 +412,29 @@ (define-public go-github-com-dvsekhvalnov-jose2go
 library.")
     (license license:expat)))
 
+(define-public go-github-com-emersion-go-bcrypt
+  (package
+    (name "go-github-com-emersion-go-bcrypt")
+    (version "0.0.0-20170822072041-6e724a1baa63")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/go-bcrypt")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pchrgs05w30iqbh4d6iys4wvlyajsdwchp5mkf59amgsbyjaqgm"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/emersion/go-bcrypt"))
+    (propagated-inputs (list go-golang-org-x-crypto))
+    (home-page "https://github.com/emersion/go-bcrypt")
+    (synopsis "Extract of bcrypt from golang.org/x/crypto/bcrypt")
+    (description "An extract bcrypt from golang.org/x/crypto/bcrypt.")
+    (license license:bsd-3)))
+
 (define-public go-github-com-emersion-go-pgpmail
   (package
     (name "go-github-com-emersion-go-pgpmail")
-- 
2.41.0

[bug#71780] [PATCH v2 5/7] gnu: Add go-github-com-emersion-go-vcard.

[Jean SIMARD]

* gnu/packages/golang.scm (go-github-com-emersion-go-vcard): New variable.

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

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 3daf97ec92..72bd64f7cd 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5985,6 +5985,99 @@ (define-public go-github-com-emersion-go-mbox
 @code{mbox} files.")
     (license license:expat)))
 
+(define-public go-github-com-emersion-go-vcard
+  (package
+    (name "go-github-com-emersion-go-vcard")
+    (version "0.0.0-20230815062825-8fda7d206ec9")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/go-vcard")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "12n5jinj5xzdfl9jhqvjbzxvj32bw310mdw4q5rjv35pk566zixl"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/emersion/go-vcard"))
+    (home-page "https://github.com/emersion/go-vcard")
+    (synopsis "Go library to parse and format vCard")
+    (description "A Go library to parse and format vCard.")
+    (license license:expat)))
+
+(define-public go-github-com-teambition-rrule-go
+  (package
+    (name "go-github-com-teambition-rrule-go")
+    (version "1.8.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/teambition/rrule-go")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1fnbava35w9z60carny5b7whd4nkv6hrf9g43wwg8d88gfij9zj2"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/teambition/rrule-go"))
+    (home-page "https://github.com/teambition/rrule-go")
+    (synopsis
+     "Go library for working with recurrence rules for calendar dates")
+    (description
+     "A go library for working with recurrence rules for calendar dates.")
+    (license license:expat)))
+
+(define-public go-github-com-emersion-go-ical
+  (package
+    (name "go-github-com-emersion-go-ical")
+    (version "0.0.0-20240127095438-fc1c9d8fb2b6")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/go-ical")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "01cn9kggkdalb6xp2nrka01gs40zs8v6h5bq8d2m8wrdcsy5b36v"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/emersion/go-ical"))
+    (propagated-inputs (list go-github-com-teambition-rrule-go))
+    (home-page "https://github.com/emersion/go-ical")
+    (synopsis "Go library for iCalendar")
+    (description "An iCalendar library for Go.")
+    (license license:expat)))
+
+(define-public go-github-com-emersion-go-webdav
+  (package
+    (name "go-github-com-emersion-go-webdav")
+    (version "v0.3.2-0.20220524091811-5d845721d8f7")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/go-webdav")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1vxf9k7m4lxsyry374bm4y34d2sb2ssy0c45mb1vchdfhffgyj9i"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/emersion/go-webdav"))
+    (propagated-inputs (list go-github-com-emersion-go-ical
+                             go-github-com-emersion-go-vcard))
+    (home-page "https://github.com/emersion/go-webdav")
+    (synopsis "Go library for WebDAV, CalDAV and CardDAV")
+    (description "A Go library for WebDAV, CalDAV and CardDAV.")
+    (license license:expat)))
+
 (define-public go-github-com-google-go-cmp-cmp
   (package
     (name "go-github-com-google-go-cmp-cmp")
-- 
2.41.0

[bug#71780] [PATCH v2 6/7] gnu: Add go-github-com-emersion-go-smtp-v0.18.

[Jean SIMARD]

* gnu/packages/golang.scm (go-github-com-emersion-go-smtp-v0.18): New variable.

Change-Id: Ib6ea1885abba6b76d1935872b800dc7eed8ab303
---
 gnu/packages/golang.scm | 57 +++++++++++++++++++++++++----------------
 1 file changed, 35 insertions(+), 22 deletions(-)

diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 72bd64f7cd..d7a3dbf3f6 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -5834,29 +5834,42 @@ (define-public go-github-com-emersion-go-smtp
 defined by RFC 5321.")
     (license license:expat)))
 
+(define-public go-github-com-emersion-go-smtp-v0.18
+  (package
+    (inherit go-github-com-emersion-go-smtp)
+    (name "go-github-com-emersion-go-smtp")
+    (version "0.18.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/go-smtp")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1d17gmz88cnfld8y1j2jsmldhvg8czbdmrjis0ls9zi7rfqlmnra"))))))
+
 (define-public go-github-com-emersion-go-sasl
-  (let ((commit "0b9dcfb154ac3d7515b08bc2691a0332800edfe9")
-        (revision "1"))
-    (package
-      (name "go-github-com-emersion-go-sasl")
-      (version (git-version "0.0.0" revision commit))
-      (source
-        (origin
-          (method git-fetch)
-          (uri (git-reference
-                (url "https://github.com/emersion/go-sasl")
-                (commit commit)))
-          (file-name (git-file-name name version))
-          (sha256
-           (base32
-            "1cbf86wkqrdinfydndgdlnayg4a5mg3d4vqra377j2sfkg7wj0hs"))))
-      (build-system go-build-system)
-      (arguments
-       (list #:import-path "github.com/emersion/go-sasl"))
-      (home-page "https://github.com/emersion/go-sasl")
-      (synopsis "SASL library written in Go")
-      (description "This package provides a SASL library written in Go.")
-      (license license:expat))))
+  (package
+    (name "go-github-com-emersion-go-sasl")
+    (version "0.0.0-20220912192320-0145f2c60ead")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/go-sasl")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "00bkl56zycs3pd1schkxx3swfjixz0lvnzdxkxx9piv99w91v2n4"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/emersion/go-sasl"))
+    (home-page "https://github.com/emersion/go-sasl")
+    (synopsis "SASL library written in Go")
+    (description "This package provides a SASL library written in Go.")
+    (license license:expat)))
 
 (define-public go-github-com-emersion-go-imap-idle
   (let ((commit "2704abd7050ed7f2143753554ee23affdf847bd9")
-- 
2.41.0

[bug#71780] [PATCH v2 7/7] gnu: Add hydroxide.

[Jean SIMARD]

* gnu/packages/mail.scm (hydroxide): New variable.

Change-Id: Ic20d8d3d22afc4a580094bed64d0aa5059a1a9cf
---
 gnu/packages/mail.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index de6d21e7cc..dd813baef6 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -56,6 +56,7 @@
 ;;; Copyright © 2023 Arjan Adriaanse <arjan@adriaan.se>
 ;;; Copyright © 2023 Wilko Meyer <w@wmeyer.eu>
 ;;; Copyright © 2024 Benjamin Slade <slade@lambda-y.net>
+;;; Copyright © 2024 Jean Simard <woshilapin@tuziwo.info>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -5121,3 +5122,39 @@ (define-public aerc
     ;; <https://lists.sr.ht/~rjarry/aerc-devel/%3Cb5cb213a7d0c699a886971658c2476
     ;; 1073eb2391%40disroot.org%3E>
     (license license:gpl3+)))
+
+(define-public hydroxide
+  (package
+    (name "hydroxide")
+    (version "0.2.28")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/emersion/hydroxide")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1a7qga9qxwcdjimra9d9jnkds1iwh2sqk6241p4di6awli9zksv1"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/emersion/hydroxide/cmd/hydroxide"
+      #:unpack-path "github.com/emersion/hydroxide"))
+    (inputs (list go-github-com-protonmail-go-crypto
+                  go-github-com-boltdb-bolt
+                  go-github-com-emersion-go-bcrypt
+                  go-github-com-emersion-go-imap
+                  go-github-com-emersion-go-mbox
+                  go-github-com-emersion-go-message
+                  go-github-com-emersion-go-smtp-v0.18
+                  go-github-com-emersion-go-vcard
+                  go-github-com-emersion-go-webdav
+                  go-golang-org-x-crypto
+                  go-golang-org-x-term))
+    (home-page "https://github.com/emersion/hydroxide")
+    (synopsis "Third-party, open-source ProtonMail bridge")
+    (description "A third-party, open-source ProtonMail bridge.
+     For power users only, designed to run on a server.
+     hydroxide supports CardDAV, IMAP and SMTP.")
+    (license license:expat)))
-- 
2.41.0

[bug#71780] [PATCH v2 7/7] gnu: Add hydroxide.

[woshilapin]

Hi Oleg,

I tried to use etc/commiter.scm with some success, but it was breaking on some of the Update commits: I took inspiration on some of the existing commits to improve them. In the end, I believe it's better than it was.

Don't hesitate to point me to some more tooling or documentation, since this is my first experience with guix packaging, and with 'git send-email', there might still be a lot of things that I don't do correctly.

Thank you very much for taking some time reviewing these.
--
Jean SIMARD aka woshilapin