[PATCH 0/3] gnu: kubo: Unbundle go-github-com-ipfs-go-ipld-cbor.

Done

Details

2 participants

Artyom V. Poptsov
Sharlatan Hellseher

Owner: unassigned

Submitted by: Artyom V. Poptsov

Severity: normal

Debbugs page

Artyom V. Poptsov wrote 8 months ago

Recipients:(address . guix-patches@gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:cover.1720203985.git.poptsov.artyom@gmail.com

Unbundle "go-github-com-ipfs-go-ipld-cbor" from Kubo (IPFS.)

Artyom V. Poptsov (3):

gnu: Add go-github-com-whyrusleeping-cbor-gen.

gnu: Add go-github-com-ipfs-go-ipld-cbor.

gnu: kubo: Unbundle go-github-com-ipfs-go-ipld-cbor.

gnu/packages/ipfs.scm | 63 ++++++++++++++++++++++++++++++++++++++++++-

1 file changed, 62 insertions(+), 1 deletion(-)

base-commit: 922e943059050f05532ac8274e55e25ebe711cf5

2.45.2

Artyom V. Poptsov wrote 8 months ago

[PATCH 1/3] gnu: Add go-github-com-whyrusleeping-cbor-gen.

Recipients:(address . 71953@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:64bd9bcf6ae38b748667b60dd783b3ee7ea32bfc.1720203985.git.poptsov.artyom@gmail.com

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

Change-Id: I7fc01ba570492a145bcea00f08e0ccb7cc0479af

---

gnu/packages/ipfs.scm | 30 ++++++++++++++++++++++++++++++

1 file changed, 30 insertions(+)

Toggle diff (43 lines)diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index d75a99c4e1..373e73f4d2 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -449,6 +449,36 @@ (define-public go-github-com-ipfs-go-log
       #:go go-1.21
       #:import-path "github.com/ipfs/go-log"))))
 
+(define-public go-github-com-whyrusleeping-cbor-gen
+  (package
+    (name "go-github-com-whyrusleeping-cbor-gen")
+    (version "v0.0.0-20230818171029-f91ae536ca25")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/whyrusleeping/cbor-gen")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "08by7pqh4fcwf2va01iif75yqkfssi6d48334404mmv9jmhzim60"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/whyrusleeping/cbor-gen"))
+    (propagated-inputs
+     (list go-github-com-ipfs-go-cid
+           go-github-com-google-go-cmp-cmp
+           go-golang-org-x-xerrors))
+    (home-page "https://github.com/whyrusleeping/cbor-gen")
+    (synopsis "Codegen for cbor codecs on your types")
+    ;; There is not much information provided by the project, see
+    ;; <https://github.com/whyrusleeping/go-sysinfo/issues>.
+    (description
+     "Some basic utilities to generate fast path @url{https://cbor.io/, CBOR} codecs
+for your types.")
+    (license license:expat)))
+
 (define-public gx
   (package
     (name "gx")
-- 
2.45.2

Artyom V. Poptsov wrote 8 months ago

[PATCH 2/3] gnu: Add go-github-com-ipfs-go-ipld-cbor.

Recipients:(address . 71953@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:ab427bf07824af4cb603ba8be3c0704982fc84ce.1720203985.git.poptsov.artyom@gmail.com

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

Change-Id: I1a85366eb558fe3043fe39d8aabd4bf14f98a32a

---

gnu/packages/ipfs.scm | 40 +++++++++++++++++++++++++++++++++++-----

1 file changed, 35 insertions(+), 5 deletions(-)

Toggle diff (61 lines)diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 373e73f4d2..3c137818ae 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -270,6 +270,38 @@ (define-public go-github-com-ipfs-go-ipfs-util
      "Common utilities used by @code{go-ipfs} and other related Go packages.")
     (license license:expat)))
 
+(define-public go-github-com-ipfs-go-ipld-cbor
+  (package
+    (name "go-github-com-ipfs-go-ipld-cbor")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ipfs/go-ipld-cbor")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0yxk4sbf1fk9aaizzpz3h30049wqvaz0s3jnbdd5akhj7wg89h21"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.21
+      #:import-path "github.com/ipfs/go-ipld-cbor"))
+    (propagated-inputs
+     (list go-github-com-ipfs-go-block-format
+           go-github-com-ipfs-go-cid
+           go-github-com-ipfs-go-ipfs-util
+           go-github-com-ipfs-go-ipld-format
+           go-github-com-multiformats-go-multihash
+           go-github-com-polydawn-refmt
+           go-github-com-whyrusleeping-cbor-gen))
+    (home-page "https://github.com/ipfs/go-ipld-cbor")
+    (synopsis "A cbor implementation of the @code{go-ipld-format}")
+    (description
+     "An implementation of a @url{https://cbor.io/, CBOR} encoded merkledag object.")
+    (license license:expat)))
+
 (define-public go-github-com-ipfs-go-ipld-format
   (package
     (name "go-github-com-ipfs-go-ipld-format")
@@ -471,12 +503,10 @@ (define-public go-github-com-whyrusleeping-cbor-gen
            go-github-com-google-go-cmp-cmp
            go-golang-org-x-xerrors))
     (home-page "https://github.com/whyrusleeping/cbor-gen")
-    (synopsis "Codegen for cbor codecs on your types")
-    ;; There is not much information provided by the project, see
-    ;; <https://github.com/whyrusleeping/go-sysinfo/issues>.
+    (synopsis "Codegen for CBOR codecs on the specified types")
     (description
-     "Some basic utilities to generate fast path @url{https://cbor.io/, CBOR} codecs
-for your types.")
+     "Basic utilities to generate fast path @url{https://cbor.io/, CBOR} codecs for
+types.")
     (license license:expat)))
 
 (define-public gx
-- 
2.45.2

Artyom V. Poptsov wrote 8 months ago

[PATCH 3/3] gnu: kubo: Unbundle go-github-com-ipfs-go-ipld-cbor.

Recipients:(address . 71953@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:c2112bc4c8189bb7ba4be007f5a447a3a728e60b.1720203985.git.poptsov.artyom@gmail.com

* gnu/packages/ipfs.scm (kubo): Unbundle go-github-com-ipfs-go-ipld-cbor.

[inputs]: Add go-github-com-ipfs-go-ipld-cbor.

Change-Id: I8edd09e134dee725f1ecaf8f4296c74c4cc5f37c

---

gnu/packages/ipfs.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 3c137818ae..6a6bd81caf 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -669,6 +669,7 @@ (define-public kubo
                              "vendor/github.com/ipfs/go-detect-race"
                              "vendor/github.com/ipfs/go-ipfs-delay"
                              "vendor/github.com/ipfs/go-ipfs-util"
+                             "vendor/github.com/ipfs/go-ipld-cbor"
                              "vendor/github.com/ipfs/go-ipld-format"
                              "vendor/github.com/ipfs/go-log"
                              "vendor/github.com/ipld/go-ipld-prime"
@@ -754,7 +755,7 @@ (define-public kubo
                   ;;go-github-com-ipfs-go-ds-measure
                   ;;go-github-com-ipfs-go-fs-lock
                   ;;go-github-com-ipfs-go-ipfs-cmds
-                  ;;go-github-com-ipfs-go-ipld-cbor
+                  go-github-com-ipfs-go-ipld-cbor
                   go-github-com-ipfs-go-ipld-format
                   ;;go-github-com-ipfs-go-ipld-git
                   ;;go-github-com-ipfs-go-ipld-legacy
-- 
2.45.2

Sharlatan Hellseher wrote 8 months ago

[PATCH 0/3] gnu: kubo: Unbundle go-github-com-ipfs-go-ipld-cbor.

Recipients:(address . 71953@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:CAO+9K5pVYcf2ynbCVotnHoaJeeB9FpZaYd7boHOLp9OSJ8MO9A@mail.gmail.com

Hi,

Thank you for the patches.

May you check [PATCH 2/3] gnu: Add go-github-com-ipfs-go-ipld-cbor, not to

include other modifications please?

Oleg

Attachment: file

Artyom V. Poptsov wrote 8 months ago

[PATCH v2 2/3] gnu: Add go-github-com-ipfs-go-ipld-cbor.

Recipients:(address . 71953@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:82a3675f30e2ca1b7861d8dab4c7ef9bf13953a2.1720336290.git.poptsov.artyom@gmail.com

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

Change-Id: I1a85366eb558fe3043fe39d8aabd4bf14f98a32a

---

gnu/packages/ipfs.scm | 32 ++++++++++++++++++++++++++++++++

1 file changed, 32 insertions(+)

Toggle diff (45 lines)diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index f5ccd6cb8f..3c137818ae 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -270,6 +270,38 @@ (define-public go-github-com-ipfs-go-ipfs-util
      "Common utilities used by @code{go-ipfs} and other related Go packages.")
     (license license:expat)))
 
+(define-public go-github-com-ipfs-go-ipld-cbor
+  (package
+    (name "go-github-com-ipfs-go-ipld-cbor")
+    (version "0.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ipfs/go-ipld-cbor")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0yxk4sbf1fk9aaizzpz3h30049wqvaz0s3jnbdd5akhj7wg89h21"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:go go-1.21
+      #:import-path "github.com/ipfs/go-ipld-cbor"))
+    (propagated-inputs
+     (list go-github-com-ipfs-go-block-format
+           go-github-com-ipfs-go-cid
+           go-github-com-ipfs-go-ipfs-util
+           go-github-com-ipfs-go-ipld-format
+           go-github-com-multiformats-go-multihash
+           go-github-com-polydawn-refmt
+           go-github-com-whyrusleeping-cbor-gen))
+    (home-page "https://github.com/ipfs/go-ipld-cbor")
+    (synopsis "A cbor implementation of the @code{go-ipld-format}")
+    (description
+     "An implementation of a @url{https://cbor.io/, CBOR} encoded merkledag object.")
+    (license license:expat)))
+
 (define-public go-github-com-ipfs-go-ipld-format
   (package
     (name "go-github-com-ipfs-go-ipld-format")
-- 
2.45.2

Artyom V. Poptsov wrote 8 months ago

[PATCH v2 1/3] gnu: Add go-github-com-whyrusleeping-cbor-gen.

Recipients:(address . 71953@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:66b591ef5f6566ca1d7b252c9050aaa4501533f3.1720336290.git.poptsov.artyom@gmail.com

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

Change-Id: I7fc01ba570492a145bcea00f08e0ccb7cc0479af

---

gnu/packages/ipfs.scm | 28 ++++++++++++++++++++++++++++

1 file changed, 28 insertions(+)

Toggle diff (41 lines)diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index d75a99c4e1..f5ccd6cb8f 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -449,6 +449,34 @@ (define-public go-github-com-ipfs-go-log
       #:go go-1.21
       #:import-path "github.com/ipfs/go-log"))))
 
+(define-public go-github-com-whyrusleeping-cbor-gen
+  (package
+    (name "go-github-com-whyrusleeping-cbor-gen")
+    (version "v0.0.0-20230818171029-f91ae536ca25")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/whyrusleeping/cbor-gen")
+             (commit (go-version->git-ref version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "08by7pqh4fcwf2va01iif75yqkfssi6d48334404mmv9jmhzim60"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/whyrusleeping/cbor-gen"))
+    (propagated-inputs
+     (list go-github-com-ipfs-go-cid
+           go-github-com-google-go-cmp-cmp
+           go-golang-org-x-xerrors))
+    (home-page "https://github.com/whyrusleeping/cbor-gen")
+    (synopsis "Codegen for CBOR codecs on the specified types")
+    (description
+     "Basic utilities to generate fast path @url{https://cbor.io/, CBOR} codecs for
+types.")
+    (license license:expat)))
+
 (define-public gx
   (package
     (name "gx")
-- 
2.45.2

Artyom V. Poptsov wrote 8 months ago

[PATCH v2 3/3] gnu: kubo: Unbundle go-github-com-ipfs-go-ipld-cbor.

Recipients:(address . 71953@debbugs.gnu.org)(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)

Message-ID:07dd457b6ebd5f8984f969f9d256adcb2dc3119b.1720336290.git.poptsov.artyom@gmail.com

* gnu/packages/ipfs.scm (kubo): Unbundle go-github-com-ipfs-go-ipld-cbor.

[inputs]: Add go-github-com-ipfs-go-ipld-cbor.

Change-Id: I8edd09e134dee725f1ecaf8f4296c74c4cc5f37c

---

gnu/packages/ipfs.scm | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (23 lines)diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 3c137818ae..6a6bd81caf 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -669,6 +669,7 @@ (define-public kubo
                              "vendor/github.com/ipfs/go-detect-race"
                              "vendor/github.com/ipfs/go-ipfs-delay"
                              "vendor/github.com/ipfs/go-ipfs-util"
+                             "vendor/github.com/ipfs/go-ipld-cbor"
                              "vendor/github.com/ipfs/go-ipld-format"
                              "vendor/github.com/ipfs/go-log"
                              "vendor/github.com/ipld/go-ipld-prime"
@@ -754,7 +755,7 @@ (define-public kubo
                   ;;go-github-com-ipfs-go-ds-measure
                   ;;go-github-com-ipfs-go-fs-lock
                   ;;go-github-com-ipfs-go-ipfs-cmds
-                  ;;go-github-com-ipfs-go-ipld-cbor
+                  go-github-com-ipfs-go-ipld-cbor
                   go-github-com-ipfs-go-ipld-format
                   ;;go-github-com-ipfs-go-ipld-git
                   ;;go-github-com-ipfs-go-ipld-legacy
-- 
2.45.2

Artyom V. Poptsov wrote 8 months ago

Re: [PATCH 0/3] gnu: kubo: Unbundle go-github-com-ipfs-go-ipld-cbor.

Recipients:(name . Sharlatan Hellseher)(address . sharlatanus@gmail.com)(address . 71953@debbugs.gnu.org)

Message-ID:87frsl7jjv.fsf@gmail.com

Hello Oleg!

Thanks for the patch review. Please find patchset v2 in the issue.

- avp

Artyom "avp" Poptsov <poptsov.artyom@gmail.com>

Home page: https://memory-heap.org/~avp/

CADR Hackerspace co-founder: https://cadrspace.ru/

GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F

Sharlatan Hellseher wrote 8 months ago

[PATCH 0/3] gnu: kubo: Unbundle go-github-com-ipfs-go-ipld-cbor.

Recipients:(address . 71953-done@debbugs.gnu.org)

Message-ID:87h6d1p77m.fsf@gmail.com

Hi,

Pushed as c6fae8a300..ff1bb647b5 to master.

I've unbundled some more packages which were quite simple are combing as

dependencies for others.

Oleg

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 71953@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 71953

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags

mumi command -t +confirmed -t +easy

Or, remove the moreinfo tag and set the help tag

mumi command -t -moreinfo -t +help

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date