[bug#70372] [PATCH 0/4] gnu: Add go-github-com-multiformats-go-multiaddr-dns.

[bug#70372] [PATCH 0/4] gnu: Add go-github-com-multiformats-go-multiaddr-dns.

[Artyom V. Poptsov]

This patch series adds "go-github-com-multiformats-go-multiaddr-dns" package
that is required for newer versions of Kubo (IPFS.)

Artyom V. Poptsov (4):
  gnu: Add go-github-com-multiformats-go-multihash-0.2.3.
  gnu: Add go-golang-org-x-exp-2023.
  gnu: Add go-github-com-multiformats-go-multiaddr-0.12.
  gnu: Add go-github-com-multiformats-go-multiaddr-dns.

 gnu/packages/golang-build.scm  | 15 ++++++++
 gnu/packages/golang-crypto.scm | 44 ++++++++++++++++++++++++
 gnu/packages/golang-web.scm    | 63 ++++++++++++++++++++++++++++++++++
 3 files changed, 122 insertions(+)


base-commit: ef9a2f9e91d37c0d93e689eb26ebeb6483655968
-- 
2.41.0

[bug#70372] [PATCH 1/4] gnu: Add go-github-com-multiformats-go-multihash-0.2.3.

[Artyom V. Poptsov]

* gnu/packages/golang-crypto.scm:
  (go-github-com-multiformats-go-multihash-0.2.3): New variable.

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

diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm
index ca35d5c391..bc440812dd 100644
--- a/gnu/packages/golang-crypto.scm
+++ b/gnu/packages/golang-crypto.scm
@@ -911,6 +911,50 @@ (define-public go-github-com-multiformats-go-multihash-0.2.3
            go-golang-org-x-crypto
            go-lukechampine-com-blake3))))
 
+(define-public go-github-com-multiformats-go-multihash-0.2.3
+  (package
+    (inherit go-github-com-multiformats-go-multihash)
+    (name "go-github-com-multiformats-go-multihash")
+    (version "0.2.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/multiformats/go-multihash")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0ydh94083888xl2r4d1grzgqf3c818mkmdpj008jkh6h7m56wc4w"))))
+    (arguments
+     (list #:go go-1.21
+           #:import-path "github.com/multiformats/go-multihash"
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'copy-multibase-specs
+                 (lambda* (#:key import-path #:allow-other-keys)
+                   (copy-recursively
+                    (string-append #$(this-package-native-input
+                                      "specification-multihash")
+                                   "/share/multihash/")
+                    (string-append "src/" import-path "/spec/multihash/"))
+                   (copy-recursively
+                    (string-append #$(this-package-native-input
+                                      "specification-multicodec")
+                                   "/share/multicodec/")
+                    (string-append "src/" import-path "/spec/multicodec/")))))))
+    (native-inputs
+     (list specification-multihash
+           specification-multicodec))
+    (propagated-inputs
+     (list go-github-com-gxed-hashland-keccakpg
+           go-github-com-minio-blake2b-simd
+           go-github-com-minio-sha256-simd
+           go-github-com-mr-tron-base58
+           go-github-com-multiformats-go-varint
+           go-github-com-spaolacci-murmur3
+           go-golang-org-x-crypto
+           go-lukechampine-com-blake3))))
+
 (define-public go-github-com-operatorfoundation-ed25519
   (let ((commit "b22b4bd3ddef042eec45f3ee135cd40281fde2b4")
         (revision "0"))
-- 
2.41.0

[bug#70372] [PATCH 2/4] gnu: Add go-golang-org-x-exp-2023.

[Artyom V. Poptsov]

* gnu/packages/golang-build.scm (go-golang-org-x-exp-2023): New variable.

Change-Id: Ibcbeee0567ac92d4050329273e585316ee726df0
---
 gnu/packages/golang-build.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 04267845a5..0b18f64baf 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -133,6 +133,21 @@ (define-public go-golang-org-x-exp
 @code{old} directory) packages.")
     (license license:bsd-3)))
 
+(define-public go-golang-org-x-exp-2023
+  (package
+    (inherit go-golang-org-x-exp)
+    (name "go-golang-org-x-exp")
+    (version "0.0.0-20230725012225-302865e7556b")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/exp")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1fkmi0zjwv70n9d9q9bmzch2zvf7xm3d65qh63zll6dljq2lh4b8"))))))
+
 (define-public go-golang-org-x-image
   (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
         (revision "1"))
-- 
2.41.0

[bug#70372] [PATCH 3/4] gnu: Add go-github-com-multiformats-go-multiaddr-0.12.

[Artyom V. Poptsov]

* gnu/packages/golang-web.scm (go-github-com-multiformats-go-multiaddr-0.12):
  New variable.

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

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 5c6d9126ef..7411acd2a2 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -56,6 +56,7 @@ (define-module (gnu packages golang-web)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-xyz)
+  #:use-module (gnu packages ipfs)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web))
 
@@ -1309,6 +1310,31 @@ (define-public go-github-com-multiformats-go-multiaddr
 @end itemize\n")
       (license license:expat))))
 
+(define-public go-github-com-multiformats-go-multiaddr-0.12
+  (package
+    (inherit go-github-com-multiformats-go-multiaddr)
+    (name "go-github-com-multiformats-go-multiaddr")
+    (version "0.12.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/multiformats/go-multiaddr")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1rn02yn7494r7ayn585bbsddprbn8wdccxs4n2k5dmll4dyd39mp"))))
+    (arguments
+     (list
+      #:go go-1.21
+      #:import-path "github.com/multiformats/go-multiaddr"))
+    (native-inputs (list go-github-com-stretchr-testify))
+    (propagated-inputs (list go-github-com-ipfs-go-cid
+                             go-github-com-multiformats-go-multibase
+                             go-github-com-multiformats-go-varint
+                             go-github-com-multiformats-go-multihash-0.2.3
+                             go-golang-org-x-exp-2023))))
+
 (define-public go-github-com-multiformats-go-multiaddr-net
   ;; This commit is from <2018-10-01> and associated with GX package manager,
   ;; since that time the project has changed versing stile and GX is dropped.
-- 
2.41.0

[bug#70372] [PATCH 4/4] gnu: Add go-github-com-multiformats-go-multiaddr-dns.

[Artyom V. Poptsov]

* gnu/packages/golang-web.scm (go-github-com-multiformats-go-multiaddr-dns):
  New variable.

Change-Id: I6e81e9b4773cd97a5625661089f4ed35d2adba33
---
 gnu/packages/golang-web.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 7411acd2a2..59dd1e0a52 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1335,6 +1335,43 @@ (define-public go-github-com-multiformats-go-multiaddr-0.12
                              go-github-com-multiformats-go-multihash-0.2.3
                              go-golang-org-x-exp-2023))))
 
+(define-public go-github-com-multiformats-go-multiaddr-dns
+  (let ((commit "6e944aaa78597c34baa8d68a91c3ca236837760c")
+        (revision "0"))
+    (package
+      (name "go-github-com-multiformats-go-multiaddr-dns")
+      (version (git-version "0.3.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/multiformats/go-multiaddr-dns")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0ns3kxixl3kmwwdl1z9jawgns00jgmi76j9gbxk68ys8a5nyng5a"))))
+      (build-system go-build-system)
+      (arguments
+       (list
+        #:import-path "github.com/multiformats/go-multiaddr-dns"
+        #:go go-1.21
+        ;; TODO: Tests fail because they try to access the network.
+        #:tests? #f))
+      (propagated-inputs (list go-github-com-gxed-hashland-keccakpg
+                               go-github-com-miekg-dns
+                               go-github-com-minio-blake2b-simd
+                               go-github-com-minio-sha256-simd
+                               go-github-com-mr-tron-base58
+                               go-github-com-multiformats-go-multiaddr-0.12
+                               go-github-com-multiformats-go-varint
+                               go-github-com-spaolacci-murmur3
+                               go-golang-org-x-crypto))
+      (home-page "https://multiformats.io/multiaddr/")
+      (synopsis "Library and CLI tool for DNS multiaddr resolution")
+      (description
+       "Go library and CLI tool for /dns4, /dns6, /dnsaddr multiaddr resolution.")
+      (license license:expat))))
+
 (define-public go-github-com-multiformats-go-multiaddr-net
   ;; This commit is from <2018-10-01> and associated with GX package manager,
   ;; since that time the project has changed versing stile and GX is dropped.
-- 
2.41.0

[bug#70372] [PATCH v2 0/3] gnu: Add go-github-com-multiformats-go-multiaddr-dns.

[Artyom V. Poptsov]

This patch series adds "go-github-com-multiformats-go-multiaddr-dns" package
that is required for newer versions of Kubo (IPFS.)

This is version 2 of the patch series without extra patch with
"go-github-com-multiformats-go-multihash-0.2.3" which is already merged into
Guix.  Also the series is rebased on "master" branch.

Artyom V. Poptsov (3):
  gnu: Add go-golang-org-x-exp-2023.
  gnu: Add go-github-com-multiformats-go-multiaddr-0.12.
  gnu: Add go-github-com-multiformats-go-multiaddr-dns.

 gnu/packages/golang-build.scm | 15 +++++++++
 gnu/packages/golang-web.scm   | 63 +++++++++++++++++++++++++++++++++++
 2 files changed, 78 insertions(+)


base-commit: 0797fff8b8b3feb1e421aad170b4c12a87091663
-- 
2.41.0

[bug#70372] [PATCH v2 1/3] gnu: Add go-golang-org-x-exp-2023.

[Artyom V. Poptsov]

* gnu/packages/golang-build.scm (go-golang-org-x-exp-2023): New variable.

Change-Id: Ibcbeee0567ac92d4050329273e585316ee726df0
---
 gnu/packages/golang-build.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm
index 04267845a5..0b18f64baf 100644
--- a/gnu/packages/golang-build.scm
+++ b/gnu/packages/golang-build.scm
@@ -133,6 +133,21 @@ (define-public go-golang-org-x-exp
 @code{old} directory) packages.")
     (license license:bsd-3)))
 
+(define-public go-golang-org-x-exp-2023
+  (package
+    (inherit go-golang-org-x-exp)
+    (name "go-golang-org-x-exp")
+    (version "0.0.0-20230725012225-302865e7556b")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://go.googlesource.com/exp")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1fkmi0zjwv70n9d9q9bmzch2zvf7xm3d65qh63zll6dljq2lh4b8"))))))
+
 (define-public go-golang-org-x-image
   (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d")
         (revision "1"))
-- 
2.41.0

[bug#70372] [PATCH v2 2/3] gnu: Add go-github-com-multiformats-go-multiaddr-0.12.

[Artyom V. Poptsov]

* gnu/packages/golang-web.scm (go-github-com-multiformats-go-multiaddr-0.12):
  New variable.

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

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 91f075ca2e..9e8f1a795a 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -56,6 +56,7 @@ (define-module (gnu packages golang-web)
   #:use-module (gnu packages golang-compression)
   #:use-module (gnu packages golang-crypto)
   #:use-module (gnu packages golang-xyz)
+  #:use-module (gnu packages ipfs)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages web))
 
@@ -1346,6 +1347,31 @@ (define-public go-github-com-multiformats-go-multiaddr
 @end itemize\n")
       (license license:expat))))
 
+(define-public go-github-com-multiformats-go-multiaddr-0.12
+  (package
+    (inherit go-github-com-multiformats-go-multiaddr)
+    (name "go-github-com-multiformats-go-multiaddr")
+    (version "0.12.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/multiformats/go-multiaddr")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1rn02yn7494r7ayn585bbsddprbn8wdccxs4n2k5dmll4dyd39mp"))))
+    (arguments
+     (list
+      #:go go-1.21
+      #:import-path "github.com/multiformats/go-multiaddr"))
+    (native-inputs (list go-github-com-stretchr-testify))
+    (propagated-inputs (list go-github-com-ipfs-go-cid
+                             go-github-com-multiformats-go-multibase
+                             go-github-com-multiformats-go-varint
+                             go-github-com-multiformats-go-multihash-0.2.3
+                             go-golang-org-x-exp-2023))))
+
 (define-public go-github-com-multiformats-go-multiaddr-net
   ;; This commit is from <2018-10-01> and associated with GX package manager,
   ;; since that time the project has changed versing stile and GX is dropped.
-- 
2.41.0

[bug#70372] [PATCH v2 3/3] gnu: Add go-github-com-multiformats-go-multiaddr-dns.

[Artyom V. Poptsov]

* gnu/packages/golang-web.scm (go-github-com-multiformats-go-multiaddr-dns):
  New variable.

Change-Id: I6e81e9b4773cd97a5625661089f4ed35d2adba33
---
 gnu/packages/golang-web.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 9e8f1a795a..27a53f9250 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -1372,6 +1372,43 @@ (define-public go-github-com-multiformats-go-multiaddr-0.12
                              go-github-com-multiformats-go-multihash-0.2.3
                              go-golang-org-x-exp-2023))))
 
+(define-public go-github-com-multiformats-go-multiaddr-dns
+  (let ((commit "6e944aaa78597c34baa8d68a91c3ca236837760c")
+        (revision "0"))
+    (package
+      (name "go-github-com-multiformats-go-multiaddr-dns")
+      (version (git-version "0.3.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/multiformats/go-multiaddr-dns")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "0ns3kxixl3kmwwdl1z9jawgns00jgmi76j9gbxk68ys8a5nyng5a"))))
+      (build-system go-build-system)
+      (arguments
+       (list
+        #:import-path "github.com/multiformats/go-multiaddr-dns"
+        #:go go-1.21
+        ;; TODO: Tests fail because they try to access the network.
+        #:tests? #f))
+      (propagated-inputs (list go-github-com-gxed-hashland-keccakpg
+                               go-github-com-miekg-dns
+                               go-github-com-minio-blake2b-simd
+                               go-github-com-minio-sha256-simd
+                               go-github-com-mr-tron-base58
+                               go-github-com-multiformats-go-multiaddr-0.12
+                               go-github-com-multiformats-go-varint
+                               go-github-com-spaolacci-murmur3
+                               go-golang-org-x-crypto))
+      (home-page "https://multiformats.io/multiaddr/")
+      (synopsis "Library and CLI tool for DNS multiaddr resolution")
+      (description
+       "Go library and CLI tool for /dns4, /dns6, /dnsaddr multiaddr resolution.")
+      (license license:expat))))
+
 (define-public go-github-com-multiformats-go-multiaddr-net
   ;; This commit is from <2018-10-01> and associated with GX package manager,
   ;; since that time the project has changed versing stile and GX is dropped.
-- 
2.41.0

bug#70372: [PATCH 0/4] gnu: Add go-github-com-multiformats-go-multiaddr-dns.

[Sharlatan Hellseher]

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


Pushed as 4e2b6d5585..79bbd178f1 to master with minor adjustments.

--
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]