[bug#72211] [PATCH 0/7] gnu: kubo: Unbundle go-github-com-ipfs-go-metrics-interface.

[bug#72211] [PATCH 0/7] gnu: kubo: Unbundle go-github-com-ipfs-go-metrics-interface.

[Artyom V. Poptsov]

This patch set unbundles go-github-com-ipfs-go-metrics-interface from Kubo
(IPFS) and adds other packages that are related to Kubo.

Artyom V. Poptsov (7):
  gnu: Add go-github-com-ipfs-go-ipfs-blocksutil.
  gnu: Add go-github-com-ipfs-go-ipfs-exchange-interface.
  gnu: Add go-github-com-ipfs-bbloom.
  gnu: Add go-github-com-ipfs-go-ipfs-ds-help.
  gnu: Add go-github-com-ipfs-go-metrics-interface.
  gnu: Add go-github-com-ipfs-go-ipfs-blockstore.
  gnu: kubo: Unbundle go-github-com-ipfs-go-metrics-interface.

 gnu/packages/ipfs.scm | 182 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 181 insertions(+), 1 deletion(-)


base-commit: 9df5289c6687cd5688c275d16417389fbab6d384
-- 
2.45.2

[bug#72211] [PATCH 1/7] gnu: Add go-github-com-ipfs-go-ipfs-blocksutil.

[Artyom V. Poptsov]

* gnu/packages/ipfs.scm (go-github-com-ipfs-go-ipfs-blocksutil): New variable.

Change-Id: I64c8f6a6d2337b40fa24e478ba49a590abced8ec
---
 gnu/packages/ipfs.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 82d8914250..01b020a14c 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -72,6 +72,35 @@ (define-public go-github-com-ipfs-go-block-format
 corresponding to the block.")
     (license license:expat)))
 
+(define-public go-github-com-ipfs-go-ipfs-blocksutil
+  ;; Use the latest commit from the "master" branch to fix the build with go-1.21.
+  (let ((commit "ce0497f5ee55c479db98905aec8ff56c27aad2a2")
+        (revision "0"))
+    (package
+      (name "go-github-com-ipfs-go-ipfs-blocksutil")
+      (version (git-version "0.0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/ipfs/go-ipfs-blocksutil")
+               (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1ya6376wphp51rv48nmv4jw3x0mf6ym5yx1650fbkp5l5crqpdb8"))))
+      (build-system go-build-system)
+      (arguments
+       (list
+        #:go go-1.21
+        #:import-path "github.com/ipfs/go-ipfs-blocksutil"))
+      (propagated-inputs (list go-github-com-ipfs-go-block-format))
+      (home-page "https://github.com/ipfs/go-ipfs-blocksutil")
+      (synopsis "Utility functions for working with IPFS blocks")
+      (description
+       "Package @code{go-ipfs-blocksutil} provides provides utility functions for
+working with @url{https://github.com/ipfs/go-block-format, IPFS blocks}.")
+      (license license:expat))))
+
 (define-public go-github-com-ipfs-go-cid
   (package
     (name "go-github-com-ipfs-go-cid")
-- 
2.45.2

[bug#72211] [PATCH 2/7] gnu: Add go-github-com-ipfs-go-ipfs-exchange-interface.

[Artyom V. Poptsov]

* gnu/packages/ipfs.scm (go-github-com-ipfs-go-ipfs-exchange-interface): New variable.

Change-Id: I5931d32952e021a29073227acc9fff5a87bbebf9
---
 gnu/packages/ipfs.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 01b020a14c..af4d6ce39c 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -272,6 +272,32 @@ (define-public go-github-com-ipfs-go-detect-race
     (description "Check if the race detector is running.")
     (license license:expat)))
 
+(define-public go-github-com-ipfs-go-ipfs-exchange-interface
+  (package
+    (name "go-github-com-ipfs-go-ipfs-exchange-interface")
+    (version "0.2.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ipfs/go-ipfs-exchange-interface")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0h5jizhjq4yz9sikqc6yhv5gsb8fgv67v0qjzagyhfznfx8kwv1d"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.21
+      #:import-path "github.com/ipfs/go-ipfs-exchange-interface"))
+    (propagated-inputs (list go-github-com-ipfs-go-block-format
+                             go-github-com-ipfs-go-cid))
+    (home-page "https://github.com/ipfs/go-ipfs-exchange-interface")
+    (synopsis "The IPFS Exchange interface")
+    (description "@code{go-ipfs-exchange-interface} defines the IPFS exchange
+interface.")
+    (license license:expat)))
+
 (define-public go-github-com-ipfs-go-ipfs-util
   (package
     (name "go-github-com-ipfs-go-ipfs-util")
-- 
2.45.2

[bug#72211] [PATCH 3/7] gnu: Add go-github-com-ipfs-bbloom.

[Artyom V. Poptsov]

* gnu/packages/ipfs.scm (go-github-com-ipfs-bbloom): New variable.

Change-Id: If5b5d486f50f82750a5b11a3248a3aaa2ed91658
---
 gnu/packages/ipfs.scm | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index af4d6ce39c..aaff903aaf 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -41,6 +41,32 @@ (define-module (gnu packages ipfs)
   #:use-module (gnu packages shells)
   #:use-module (gnu packages specifications))
 
+(define-public go-github-com-ipfs-bbloom
+  (package
+    (name "go-github-com-ipfs-bbloom")
+    (version "0.0.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ipfs/bbloom")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0dcdn7nlysynl7yrbivv8m7j83jq7pabhcff8mvfjdk583rgnkp2"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.21
+      #:import-path "github.com/ipfs/bbloom"))
+    (home-page "https://github.com/ipfs/bbloom")
+    (synopsis "Fast bit set Bloom filter")
+    (description
+     "@code{bbloom} package implements a fast bloom filter with real @code{bitset}
+and JSONMarshal/JSONUnmarshal to store/reload the Bloom filter.")
+    (license (list license:expat             ; bbloom.go
+                   license:public-domain)))) ; siphash.go
+
 (define-public go-github-com-ipfs-go-block-format
   (package
     (name "go-github-com-ipfs-go-block-format")
-- 
2.45.2

[bug#72211] [PATCH 4/7] gnu: Add go-github-com-ipfs-go-ipfs-ds-help.

[Artyom V. Poptsov]

* gnu/packages/ipfs.scm (go-github-com-ipfs-go-ipfs-ds-help): New variable.

Change-Id: Ia174fec9c8a6bae4838e5a4ec06d0f555894c37e
---
 gnu/packages/ipfs.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index aaff903aaf..df59f1adbf 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -239,6 +239,35 @@ (define-public go-github-com-ipfs-go-ipfs-delay
 objects.")
     (license license:expat)))
 
+(define-public go-github-com-ipfs-go-ipfs-ds-help
+  (package
+    (name "go-github-com-ipfs-go-ipfs-ds-help")
+    (version "1.1.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ipfs/go-ipfs-ds-help")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1xmn9pdyrcim9ahqs9pkh0c9ac71gilb3pb48kcagq8zxf22i4bj"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/ipfs/go-ipfs-ds-help"))
+    (propagated-inputs
+     (list go-github-com-ipfs-go-cid
+           go-github-com-ipfs-go-datastore
+           go-github-com-multiformats-go-base32
+           go-github-com-multiformats-go-multihash))
+    (home-page "https://github.com/ipfs/go-ipfs-ds-help")
+    (synopsis "Utilities for parsing and creating datastore keys")
+    (description
+     "@code{go-ipfs-ds-help} provides utilities for parsing and creating datastore
+keys used by @code{go-ipfs} (Kubo).")
+    (license license:expat)))
+
 (define-public go-github-com-ipfs-go-datastore
   (package
     (name "go-github-com-ipfs-go-datastore")
-- 
2.45.2

[bug#72211] [PATCH 5/7] gnu: Add go-github-com-ipfs-go-metrics-interface.

[Artyom V. Poptsov]

* gnu/packages/ipfs.scm (go-github-com-ipfs-go-metrics-interface): New variable.

Change-Id: Ibdc97a27f873615d3ace7dbaee8709a174b783dd
---
 gnu/packages/ipfs.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index df59f1adbf..21440b1948 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -684,6 +684,37 @@ (define-public go-github-com-ipfs-go-log
      (list
       #:import-path "github.com/ipfs/go-log"))))
 
+(define-public go-github-com-ipfs-go-metrics-interface
+  (package
+    (name "go-github-com-ipfs-go-metrics-interface")
+    (version "0.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ipfs/go-metrics-interface")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "09xc71175sfnqlizkbw066jagnbag9ihvs240z6g6dm2yx3w5xgy"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.21
+      #:import-path "github.com/ipfs/go-metrics-interface"))
+    (propagated-inputs
+     (list go-github-com-ipfs-go-cid
+           go-github-com-ipfs-go-datastore
+           go-github-com-multiformats-go-base32
+           go-github-com-multiformats-go-multihash))
+    (home-page "https://github.com/ipfs/go-metrics-interface")
+    ;; XXX: The project neither has a no proper description, nor a README (see
+    ;; <https://github.com/ipfs/go-metrics-interface/issues/1>.)
+    (synopsis "Metrics interface for IPFS")
+    (description
+     "Metrics interface for IPFS (Kubo).")
+    (license license:expat)))
+
 (define-public go-github-com-libp2p-go-socket-activation
   (package
     (name "go-github-com-libp2p-go-socket-activation")
-- 
2.45.2

[bug#72211] [PATCH 6/7] gnu: Add go-github-com-ipfs-go-ipfs-blockstore.

[Artyom V. Poptsov]

* gnu/packages/ipfs.scm (go-github-com-ipfs-go-ipfs-blockstore): New variable.

Change-Id: I75b885ec55b5bd8ae274a4832d421bf2de696314
---
 gnu/packages/ipfs.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 21440b1948..25d3d6212f 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -98,6 +98,44 @@ (define-public go-github-com-ipfs-go-block-format
 corresponding to the block.")
     (license license:expat)))
 
+(define-public go-github-com-ipfs-go-ipfs-blockstore
+  (package
+    (name "go-github-com-ipfs-go-ipfs-blockstore")
+    (version "1.3.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ipfs/go-ipfs-blockstore")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1a3a0fm8k8njdlq2w795qff01piadjfp6r5r2hww69fxqsplln9l"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.21
+      #:import-path "github.com/ipfs/go-ipfs-blockstore"))
+    (propagated-inputs
+     (list go-github-com-hashicorp-golang-lru
+           go-github-com-ipfs-bbloom
+           go-github-com-ipfs-go-block-format
+           go-github-com-ipfs-go-cid
+           go-github-com-ipfs-go-datastore
+           go-github-com-ipfs-go-ipfs-ds-help
+           go-github-com-ipfs-go-ipfs-util
+           go-github-com-ipfs-go-ipld-format
+           go-github-com-ipfs-go-log
+           go-github-com-ipfs-go-metrics-interface
+           go-github-com-multiformats-go-multihash
+           go-go-uber-org-atomic))
+    (home-page "https://github.com/ipfs/go-ipfs-blockstore")
+    (synopsis "Caching wrapper over a IPFS datastore")
+    (description
+     "@code{go-ipfs-blockstore} implements a thin wrapper over an IPFS datastore,
+giving a clean interface for getting and putting block objects.")
+    (license license:expat)))
+
 (define-public go-github-com-ipfs-go-ipfs-blocksutil
   ;; Use the latest commit from the "master" branch to fix the build with go-1.21.
   (let ((commit "ce0497f5ee55c479db98905aec8ff56c27aad2a2")
-- 
2.45.2

[bug#72211] [PATCH 7/7] gnu: kubo: Unbundle go-github-com-ipfs-go-metrics-interface.

[Artyom V. Poptsov]

* gnu/packages/ipfs.scm (kubo) [snippet]: Remove go-metrics-interface.
[inputs]: Add go-github-com-ipfs-go-metrics-interface.

Change-Id: I206ce8d2b1823bd60f799aa815fcfb6d366e1704
---
 gnu/packages/ipfs.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 25d3d6212f..58aedacf17 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -982,6 +982,7 @@ (define-public kubo
                              "vendor/github.com/ipfs/go-ipld-git"
                              "vendor/github.com/ipfs/go-ipld-legacy"
                              "vendor/github.com/ipfs/go-log"
+                             "vendor/github.com/ipfs/go-metrics-interface"
                              "vendor/github.com/ipld/go-codec-dagpb"
                              "vendor/github.com/ipld/go-ipld-prime"
                              "vendor/github.com/jackpal"
@@ -1073,7 +1074,7 @@ (define-public kubo
                   go-github-com-ipfs-go-ipld-legacy
                   go-github-com-ipfs-go-log
                   go-github-com-ipfs-go-log-v2
-                  ;;go-github-com-ipfs-go-metrics-interface
+                  go-github-com-ipfs-go-metrics-interface
                   ;;go-github-com-ipfs-go-metrics-prometheus
                   ;;go-github-com-ipfs-go-unixfsnode
                   ;;go-github-com-ipfs-shipyard-nopfs
-- 
2.45.2

bug#72211: [PATCH 0/7] gnu: kubo: Unbundle go-github-com-ipfs-go-metrics-interface.

[Sharlatan Hellseher]

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


Hi,

Pushed 2053b36e5c..1090834a3d to master with minor style adjustments.

Thank you for your work!

Oleg

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