[bug#70631] [PATCH 0/6] gnu: kubo: Unbundle "go-cidutil", "go-log" and "go-ipfs-util".

[bug#70631] [PATCH 0/6] gnu: kubo: Unbundle "go-cidutil", "go-log" and "go-ipfs-util".

[Artyom V. Poptsov]

Unbundle some more packages from Kubo (IPFS).

Artyom V. Poptsov (6):
  gnu: Add go-github-com-ipfs-go-ipfs-util.
  gnu: Add go-github-com-ipfs-go-detect-race.
  gnu: Add go-github-com-ipfs-go-log-v2.
  gnu: Add go-github-com-ipfs-go-log.
  gnu: Add go-github-com-ipfs-go-cidutil.
  gnu: kubo: Unbundle "go-cidutil", "go-log" and "go-ipfs-util".

 gnu/packages/ipfs.scm | 143 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 140 insertions(+), 3 deletions(-)


base-commit: 9f183c3627a006e8fd3bb9708448bc05a6204e6d
-- 
2.41.0

[bug#70631] [PATCH 1/6] gnu: Add go-github-com-ipfs-go-ipfs-util.

[Artyom V. Poptsov]

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

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

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index ac832dcd52..c827fb24ee 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -97,6 +97,32 @@ (define-public go-github-com-ipfs-go-ipfs-cmdkit-files
 @command{go-ipfs-cmds}.")
       (license license:expat))))
 
+(define-public go-github-com-ipfs-go-ipfs-util
+  (package
+    (name "go-github-com-ipfs-go-ipfs-util")
+    (version "0.0.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ipfs/go-ipfs-util")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0x80c6a50zcv473xx0b39sz2xkwpiw3nmmjf51k5x7a4rx0rgvx4"))))
+    (build-system go-build-system)
+    (propagated-inputs (list go-github-com-mr-tron-base58
+                             go-github-com-multiformats-go-multihash))
+    (arguments
+     (list
+      #:go go-1.21
+      #:import-path "github.com/ipfs/go-ipfs-util"))
+    (home-page "https://github.com/ipfs/go-ipfs-util")
+    (synopsis "Common utilities used by @code{go-ipfs} and related packages")
+    (description
+     "Common utilities used by @code{go-ipfs} and other related Go packages.")
+    (license license:expat)))
+
 (define-public go-github-com-ipfs-go-ipfs-api
   (let ((commit
           "dafc2a13a4389ac1a6c2786e34ab70a4f26d3a3f")
-- 
2.41.0

[bug#70631] [PATCH 2/6] gnu: Add go-github-com-ipfs-go-detect-race.

[Artyom V. Poptsov]

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

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

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index c827fb24ee..d8ddd5bb52 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -97,6 +97,29 @@ (define-public go-github-com-ipfs-go-ipfs-cmdkit-files
 @command{go-ipfs-cmds}.")
       (license license:expat))))
 
+(define-public go-github-com-ipfs-go-detect-race
+  (package
+    (name "go-github-com-ipfs-go-detect-race")
+    (version "0.0.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ipfs/go-detect-race")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0rqb0q66d7z852j5mhlr025dz698c44w014g4mx587amr1rvwqna"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.21
+      #:import-path "github.com/ipfs/go-log/v2"))
+    (home-page "https://github.com/ipfs/go-detect-race")
+    (synopsis "Detect if compiled with race")
+    (description "Check if the race detector is running.")
+    (license license:expat)))
+
 (define-public go-github-com-ipfs-go-ipfs-util
   (package
     (name "go-github-com-ipfs-go-ipfs-util")
-- 
2.41.0

[bug#70631] [PATCH 3/6] gnu: Add go-github-com-ipfs-go-log-v2.

[Artyom V. Poptsov]

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

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

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index d8ddd5bb52..905cda71e9 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -194,6 +194,36 @@ (define-public go-github-com-ipfs-go-ipfs-api
       (description "An unofficial Go interface to IPFS's HTTP API")
       (license license:expat))))
 
+(define-public go-github-com-ipfs-go-log-v2
+  (package
+    (name "go-github-com-ipfs-go-log-v2")
+    (version "2.5.1")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ipfs/go-log")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1yh3sw8knpy364h8h8rqw193whnjd6fbc13cxh6zs29z3x2a7aqa"))))
+    (build-system go-build-system)
+    (propagated-inputs (list go-github-com-mattn-go-isatty
+                             go-go-uber-org-multierr
+                             go-go-uber-org-zap))
+    (arguments
+     (list
+      #:go go-1.21
+      #:unpack-path "github.com/ipfs/go-log/v2"
+      #:import-path "github.com/ipfs/go-log/v2"))
+    (home-page "https://github.com/ipfs/go-log")
+    (synopsis "Logging library used by @code{go-ipfs}")
+    (description
+     "@code{go-log} wraps @url{https://github.com/uber-go/zap, zap} to
+provide a logging facade.  @code{go-log} manages logging instances and allows for
+their levels to be controlled individually.")
+    (license license:expat)))
+
 (define-public gx
   (package
     (name "gx")
-- 
2.41.0

[bug#70631] [PATCH 4/6] gnu: Add go-github-com-ipfs-go-log.

[Artyom V. Poptsov]

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

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

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 905cda71e9..96802c0c57 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -224,6 +224,30 @@ (define-public go-github-com-ipfs-go-log-v2
 their levels to be controlled individually.")
     (license license:expat)))
 
+(define-public go-github-com-ipfs-go-log
+  (package
+    (inherit go-github-com-ipfs-go-log-v2)
+    (name "go-github-com-ipfs-go-log")
+    (version "1.0.5")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ipfs/go-log")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0gj2yqrv6wgpkv6f9c1anmw5kwg59plv0jrcxb3zmjrnk8fsn1jr"))))
+    (propagated-inputs (list go-github-com-gogo-protobuf
+                             go-github-com-ipfs-go-log-v2
+                             go-github-com-opentracing-opentracing-go
+                             go-go-uber-org-zap))
+    (arguments
+     (list
+      #:go go-1.21
+      #:unpack-path "github.com/ipfs/go-log"
+      #:import-path "github.com/ipfs/go-log"))))
+
 (define-public gx
   (package
     (name "gx")
-- 
2.41.0

[bug#70631] [PATCH 5/6] gnu: Add go-github-com-ipfs-go-cidutil.

[Artyom V. Poptsov]

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

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

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 96802c0c57..faf390d19c 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -68,6 +68,36 @@ (define-public go-github-com-ipfs-go-cid
 used in @code{go-ipfs} and related packages to refer to a typed hunk of data.")
     (license license:expat)))
 
+(define-public go-github-com-ipfs-go-cidutil
+  (package
+    (name "go-github-com-ipfs-go-cidutil")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ipfs/go-cidutil")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0j18wf42rfxrrh2fjdbjsjvjqxwgvg46b9wl6y5ig22fx5hvpm1n"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.21
+      #:import-path "github.com/ipfs/go-cidutil"))
+    (propagated-inputs
+     (list go-github-com-ipfs-go-cid
+           go-github-com-multiformats-go-multibase
+           go-github-com-multiformats-go-multicodec
+           go-github-com-multiformats-go-multihash))
+    (home-page "https://github.com/ipfs/go-cidutil")
+    (synopsis "Utility functions and types for working with CIDs")
+    (description
+     "@code{go-cidutil} implements various utilities and helper functions for working
+with @url{https://github.com/ipld/cid, CIDs}.")
+    (license license:expat)))
+
 (define-public go-github-com-ipfs-go-ipfs-cmdkit-files
   (let ((commit
           "386fcf8f18a185ec121676665fe2d9574496048d")
-- 
2.41.0

[bug#70631] [PATCH 6/6] gnu: kubo: Unbundle "go-cidutil", "go-log" and "go-ipfs-util".

[Artyom V. Poptsov]

* gnu/packages/ipfs.scm (kubo) [source]: Delete "go-cidutil", "go-log",
  "go-ipfs-util" from bundled packages.
  [inputs]: Add go-github-com-ipfs-go-cidutil, go-github-com-ipfs-go-log,
  go-github-com-ipfs-go-log-v2, and go-github-com-ipfs-go-ipfs-util.

Change-Id: I3e49deb9572c6ac471210a392a52117fd0b9ce1a
---
 gnu/packages/ipfs.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index faf390d19c..cd62e8c0cd 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -419,6 +419,9 @@ (define-public kubo
                              "vendor/github.com/gorilla"
                              "vendor/github.com/hashicorp"
                              "vendor/github.com/ipfs/go-cid"
+                             "vendor/github.com/ipfs/go-cidutil"
+                             "vendor/github.com/ipfs/go-log"
+                             "vendor/github.com/ipfs/go-ipfs-util"
                              "vendor/github.com/jackpal"
                              "vendor/github.com/jbenet"
                              "vendor/github.com/julienschmidt"
@@ -488,7 +491,7 @@ (define-public kubo
                   ;;go-github-com-ipfs-boxo
                   ;;go-github-com-ipfs-go-block-format
                   go-github-com-ipfs-go-cid
-                  ;;go-github-com-ipfs-go-cidutil
+                  go-github-com-ipfs-go-cidutil
                   ;;go-github-com-ipfs-go-datastore
                   ;;go-github-com-ipfs-go-detect-race
                   ;;go-github-com-ipfs-go-ds-badger
@@ -501,8 +504,8 @@ (define-public kubo
                   ;;go-github-com-ipfs-go-ipld-format
                   ;;go-github-com-ipfs-go-ipld-git
                   ;;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-log
+                  go-github-com-ipfs-go-log-v2
                   ;;go-github-com-ipfs-go-metrics-interface
                   ;;go-github-com-ipfs-go-metrics-prometheus
                   ;;go-github-com-ipfs-go-unixfsnode
@@ -527,6 +530,7 @@ (define-public kubo
                   ;;go-github-com-libp2p-go-libp2p-routing-helpers
                   ;;go-github-com-libp2p-go-libp2p-testing
                   ;;go-github-com-libp2p-go-socket-activation
+                  go-github-com-ipfs-go-ipfs-util
                   go-github-com-mitchellh-go-homedir
                   go-github-com-multiformats-go-multiaddr-0.12
                   go-github-com-multiformats-go-multiaddr-dns
-- 
2.41.0

bug#70631: [PATCH 0/6] gnu: kubo: Unbundle "go-cidutil", "go-log" and "go-ipfs-util".

[Sharlatan Hellseher]

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


Pushed as f669a24a95..8cb146a3e6 to master.

--
Oleg

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