[bug#71433] [PATCH 0/6] gnu: kubo: Unbundle more Go packages.

[bug#71433] [PATCH 0/6] gnu: kubo: Unbundle more Go packages.

[Artyom V. Poptsov]

Unbundle "go-github-com-cenkalti-backoff-v4" and
"go-github-com-cheggaaa-pb-v1" from Kubo (IPFS.)

Artyom V. Poptsov (6):
  gnu: Add go-github-com-elgris-jsondiff.
  gnu: Add go-github-com-cenkalti-backoff-v4.
  gnu: kubo: Unbundle go-github-com-cenkalti-backoff-v4.
  gnu: go-gopkg-in-cheggaaa-pb-v1: Update to 1.0.29.
  gnu: go-gopkg-in-cheggaaa-pb-v1: Rename to
    go-github-com-cheggaaa-pb-v1.
  gnu: kubo: go-github-com-cheggaaa-pb-v1.

 gnu/packages/golang-web.scm | 29 +++++++++++++++++++++++++++++
 gnu/packages/golang-xyz.scm | 37 ++++++++++++++++++++++++++++++++-----
 gnu/packages/ipfs.scm       |  6 ++++--
 3 files changed, 65 insertions(+), 7 deletions(-)


base-commit: bc8a41f4a8d9f1f0525d7bc97c67ed3c8aea3111
-- 
2.45.1

[bug#71433] [PATCH 1/6] gnu: Add go-github-com-elgris-jsondiff.

[Artyom V. Poptsov]

* gnu/packages/golang-xyz.scm (go-github-com-elgris-jsondiff): New variable.

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

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 0b869b39e3..cc417b2c24 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1222,6 +1222,33 @@ (define-public go-github-com-dustin-gojson
 scanner API made public.")
     (license license:bsd-3)))
 
+(define-public go-github-com-elgris-jsondiff
+  (package
+    (name "go-github-com-elgris-jsondiff")
+    (version "v0.0.0-20160530203242-765b5c24c302")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/elgris/jsondiff")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0jm1q0s531hmkqdx8jqphfpmzysn44aphkpwlzqwp3hkz89g4d4q"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:go go-1.21
+           #:import-path "github.com/elgris/jsondiff"))
+    (native-inputs
+     (list go-github-com-stretchr-testify))
+    (propagated-inputs (list go-github-com-mgutz-ansi))
+    (home-page "https://github.com/elgris/jsondiff")
+    (synopsis "Produce readable diff of 2 JSON-able objects")
+    (description
+     "@code{jsondiff} produces readable diff of 2 JSON-able (read \"convertible to
+map[string]interface{}\") objects.  Useful for diagnostics or debugging.")
+    (license license:expat)))
+
 (define-public go-github-com-elliotchance-orderedmap
   (package
     (name "go-github-com-elliotchance-orderedmap")
-- 
2.45.1

[bug#71433] [PATCH 2/6] gnu: Add go-github-com-cenkalti-backoff-v4.

[Artyom V. Poptsov]

* gnu/packages/golang-web.scm (go-github-com-cenkalti-backoff-v4): New variable.

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

diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm
index 68534ecc9a..367ecfce71 100644
--- a/gnu/packages/golang-web.scm
+++ b/gnu/packages/golang-web.scm
@@ -456,6 +456,35 @@ (define-public go-github-com-bep-golibsass
      "This package provides SCSS compiler support for Go applications.")
     (license license:expat)))
 
+(define-public go-github-com-cenkalti-backoff-v4
+  (package
+    (name "go-github-com-cenkalti-backoff-v4")
+    (version "4.3.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/cenkalti/backoff")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pwr7fzxgngb073q98qrz1f90bkk3pljynif6jl5a6q6kcsn7xf1"))))
+    (build-system go-build-system)
+    (arguments
+     (list #:go go-1.21
+           #:import-path "github.com/cenkalti/backoff/v4"))
+    (home-page "https://github.com/cenkalti/backoff")
+    (synopsis "The exponential backoff algorithm in Go")
+    (description "This is a Go port of the exponential backoff algorithm from
+@url{https://github.com/google/google-http-java-client/blob/da1aa993e90285ec18579f1553339b00e19b3ab5/google-http-client/src/main/java/com/google/api/client/util/ExponentialBackOff.java,
+Google's HTTP Client Library for Java}.
+
+@url{http://en.wikipedia.org/wiki/Exponential_backoff, Exponential backoff} is an
+algorithm that uses feedback to multiplicatively decrease the rate of some process,
+in order to gradually find an acceptable rate.  The retries exponentially increase
+and stop increasing when a certain threshold is met.")
+    (license license:expat)))
+
 (define-public go-github-com-chris-ramon-douceur
   (package
     (name "go-github-com-chris-ramon-douceur")
-- 
2.45.1

[bug#71433] [PATCH 3/6] gnu: kubo: Unbundle go-github-com-cenkalti-backoff-v4.

[Artyom V. Poptsov]

* gnu/packages/ipfs.scm (kubo): Unbundle go-github-com-cenkalti-backoff-v4.
  [inputs]: Add go-github-com-cenkalti-backoff-v4.

Change-Id: I7cbaa336cc46d64fe66047e610384457f5e2abe0
---
 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 0dc29da783..fea5c027a3 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -407,6 +407,7 @@ (define-public kubo
                              "vendor/github.com/beorn7/perks"
                              "vendor/github.com/blang"
                              "vendor/github.com/cespare"
+                             "vendor/github.com/cenkalti"
                              "vendor/github.com/davecgh"
                              "vendor/github.com/dustin"
                              "vendor/github.com/elgris"
@@ -480,7 +481,7 @@ (define-public kubo
                   ;;go-contrib-go-opencensus-io-exporter-prometheus
                   go-github-com-benbjohnson-clock
                   go-github-com-blang-semver-v4
-                  ;;go-github-com-cenkalti-backoff-v4
+                  go-github-com-cenkalti-backoff-v4
                   ;;go-github-com-ceramicnetwork-go-dag-jose
                   ;;go-github-com-cheggaaa-pb
                   ;;go-github-com-coreos-go-systemd-v22
-- 
2.45.1

[bug#71433] [PATCH 4/6] gnu: go-gopkg-in-cheggaaa-pb-v1: Update to 1.0.29.

[Artyom V. Poptsov]

* gnu/packages/golang-xyz.scm (go-gopkg-in-cheggaaa-pb-v1): Update to 1.0.29.
  [arguments]: Set the import path to "github.com/cheggaaa/pb".

Change-Id: I0042b64c44386d588bad7779444f1f6652619a2d
---
 gnu/packages/golang-xyz.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index cc417b2c24..a4c6f7d031 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -3790,7 +3790,7 @@ (define-public go-gopkg-in-cheggaaa-pb-v1
   (package
     (inherit go-github-com-cheggaaa-pb-v3)
     (name "go-gopkg-in-cheggaaa-pb-v1")
-    (version "1.0.28")
+    (version "1.0.29")
     (source
      (origin
        (method git-fetch)
@@ -3799,10 +3799,10 @@ (define-public go-gopkg-in-cheggaaa-pb-v1
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "13a66cqbpdif804qj12z9ad8r24va9q41gfk71qbc4zg1wsxs3rh"))))
+        (base32 "0n8y589gf9aw53j72y4z8mzkgahbf6k8h19n2j0mllw5xpvpgijy"))))
     (arguments
      (list
-      #:import-path "gopkg.in/cheggaaa/pb.v1"))))
+      #:import-path "github.com/cheggaaa/pb"))))
 
 (define-public go-gopkg-in-natefinch-lumberjack.v2
   (package
-- 
2.45.1

[bug#71433] [PATCH 5/6] gnu: go-gopkg-in-cheggaaa-pb-v1: Rename to go-github-com-cheggaaa-pb-v1.

[Artyom V. Poptsov]

* gnu/packages/golang-xyz.scm (go-gopkg-in-cheggaaa-pb-v1): Rename to
  go-github-com-cheggaaa-pb-v1.

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

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index a4c6f7d031..1aa5f235c0 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -3786,10 +3786,10 @@ (define-public go-gopkg-in-alecthomas-kingpin-v2
      (list
       #:import-path "gopkg.in/alecthomas/kingpin.v2"))))
 
-(define-public go-gopkg-in-cheggaaa-pb-v1
+(define-public go-github-com-cheggaaa-pb-v1
   (package
     (inherit go-github-com-cheggaaa-pb-v3)
-    (name "go-gopkg-in-cheggaaa-pb-v1")
+    (name "go-github-com-cheggaaa-pb-v1")
     (version "1.0.29")
     (source
      (origin
-- 
2.45.1

[bug#71433] [PATCH 6/6] gnu: kubo: go-github-com-cheggaaa-pb-v1.

[Artyom V. Poptsov]

* gnu/packages/ipfs.scm (kubo): Unbundle go-github-com-cheggaaa-pb-v1.
  [inputs]: go-github-com-cheggaaa-pb-v1.

Change-Id: I390fe4d26b892fc2f7703f69b62ed1678c031905
---
 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 fea5c027a3..8dabdf1a79 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -408,6 +408,7 @@ (define-public kubo
                              "vendor/github.com/blang"
                              "vendor/github.com/cespare"
                              "vendor/github.com/cenkalti"
+                             "vendor/github.com/cheggaaa"
                              "vendor/github.com/davecgh"
                              "vendor/github.com/dustin"
                              "vendor/github.com/elgris"
@@ -483,7 +484,7 @@ (define-public kubo
                   go-github-com-blang-semver-v4
                   go-github-com-cenkalti-backoff-v4
                   ;;go-github-com-ceramicnetwork-go-dag-jose
-                  ;;go-github-com-cheggaaa-pb
+                  go-github-com-cheggaaa-pb-v1
                   ;;go-github-com-coreos-go-systemd-v22
                   go-github-com-dustin-go-humanize
                   go-github-com-elgris-jsondiff
-- 
2.45.1

bug#71433: [PATCH 0/6] gnu: kubo: Unbundle more Go packages.

[Sharlatan Hellseher]

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


Hi,

Thank you for your work on unbundling a long list of inputs for Kubo it
would for sure benefits to bring more nice projects which require that
packages.

Pushed as bc8a9a0063..79d2c8e7b9 to master with some modificatonis.

- patches [5/5]
  - [X] [PATCH 1/6] gnu: Add go-github-com-elgris-jsondiff.
    - It was available in golang-check, do not apply the patch
  - [X] [PATCH 2/6] gnu: Add go-github-com-cenkalti-backoff-v4.
  - [X] Squash 2 patches [2/2]
    - [X] [PATCH 3/6] gnu: kubo: Unbundle go-github-com-cenkalti-backoff-v4.
    - [X] [PATCH 6/6] gnu: kubo: go-github-com-cheggaaa-pb-v1.
  - [X] [PATCH 4/6] gnu: go-gopkg-in-cheggaaa-pb-v1: Update to 1.0.29.
  - [X] [PATCH 5/6] gnu: go-gopkg-in-cheggaaa-pb-v1: Rename to go-github-com-cheggaaa-pb-v1.
    - Sort alphabetically
    - Name as go-github-com-cheggaaa-pb according to go.mode path
    - Adjust inheritance for go-github-com-cheggaaa-pb-v3

--
Oleg

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