[bug#40038] [PATCH] gnu: Add guile-torrent.

[bug#40038] [PATCH] gnu: Add guile-torrent.

[Amar M. Singh]

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


This is an alpha package provides facilities for working with `.torrent'
or metainfo files. Implements a bencode reader and writer according to
Bitorrent BEP003, also provides a s-expression syntax for writing
metainfo.

Note: I am aware that there might be a naming-conflict with another
module "Guile-Torrent" that roptat is working on.

Thanks,
Amar


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-guile-torrent.patch --]
[-- Type: text/x-patch, Size: 1895 bytes --]

From 67516dd69842b483f7c05dd6048561053bcce37c Mon Sep 17 00:00:00 2001
From: Amar Singh <nly@disroot.org>
Date: Thu, 12 Mar 2020 16:25:33 +0530
Subject: [PATCH] gnu: Add guile-torrent.

* gnu/packages/guile-xyz.scm (guile-torrent): New variable.
---
 gnu/packages/guile-xyz.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 37a5198e4e..7880e29b20 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3109,3 +3109,32 @@ currently a re-implementation of the lentes library for Clojure.  Lenses
 provide composable procedures, which can be used to focus, apply functions
 over, or update a value in arbitrary data structures.")
       (license license:gpl3+))))
+
+(define-public guile-torrent
+  (package (name "guile-torrent")
+   (version "0.1-preview")
+   (source (origin (method git-fetch)
+                   (uri (git-reference
+                         (url
+                          "https://github.com/o-nly/torrent.git")
+                         (commit version)))
+                   (file-name (git-file-name name version))
+                   (sha256
+                    (base32
+                     "0rim8gr0cpnm1lixihsjpzg5z3i44vhqgj0dv6z7xj6jiwrmi9pw"))))
+   (build-system gnu-build-system)
+   (native-inputs
+    `(("autoconf" ,autoconf)
+      ("automake" ,automake)
+      ("guile" ,guile-2.2)
+      ("texinfo" ,texinfo)
+      ("perl" ,perl)
+      ("pkg-config" ,pkg-config)))
+   (inputs
+    `(("guile-gcrypt" ,guile-gcrypt)))
+   (home-page "https://github.com/o-nly/torrent")
+   (synopsis "Torrent library for GNU Guile")
+   (description
+    "This package provides facilities for working with `.torrent' or metainfo
+files. Implements a bencode reader and writer according to Bitorrent BEP003.")
+   (license license:gpl3+)))
-- 
2.25.1

[bug#40038] [PATCH] gnu: guile-torrent: fix description according to guix lint

[Amar M. Singh]

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


fixed description styling.

(and didn't forget to attach patch)

Thanks,
Amar


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-guile-torrent-fix-description-according-to-guix-.patch --]
[-- Type: text/x-patch, Size: 1042 bytes --]

From bbc6c42fda0a0495b432c0c530627a2600896e08 Mon Sep 17 00:00:00 2001
From: Amar Singh <nly@disroot.org>
Date: Thu, 12 Mar 2020 16:44:40 +0530
Subject: [PATCH] gnu: guile-torrent: fix description according to guix lint

---
 gnu/packages/guile-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 7880e29b20..e214fe45b0 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3135,6 +3135,6 @@ over, or update a value in arbitrary data structures.")
    (home-page "https://github.com/o-nly/torrent")
    (synopsis "Torrent library for GNU Guile")
    (description
-    "This package provides facilities for working with `.torrent' or metainfo
-files. Implements a bencode reader and writer according to Bitorrent BEP003.")
+    "This package provides facilities for working with @code{.torrent} or metainfo
+files.  Implements a bencode reader and writer according to Bitorrent BEP003.")
    (license license:gpl3+)))
-- 
2.25.1

[bug#40038] [PATCH] gnu: Add guile-torrent.

[Mathieu Othacehe]

Hello Amar,

Thanks for this patch.

;;; Copyright © 2019 Amar Singh <nly@disroot.org>

Don't forget to update your copyright.

+(define-public guile-torrent
+  (package (name "guile-torrent")
            ^
            This should be on the next line.

+   (version "0.1-preview")
+   (source (origin (method git-fetch)
+                   (uri (git-reference
+                         (url
+                          "https://github.com/o-nly/torrent.git")
+                         (commit version)))
+                   (file-name (git-file-name name version))
+                   (sha256
+                    (base32
+                     "0rim8gr0cpnm1lixihsjpzg5z3i44vhqgj0dv6z7xj6jiwrmi9pw"))))
+   (build-system gnu-build-system)
+   (native-inputs
+    `(("autoconf" ,autoconf)
+      ("automake" ,automake)
+      ("guile" ,guile-2.2)
+      ("texinfo" ,texinfo)
+      ("perl" ,perl)
+      ("pkg-config" ,pkg-config)))
+   (inputs
+    `(("guile-gcrypt" ,guile-gcrypt)))

guile-gcrypt probably needs to be a propagated-input.

+   (home-page "https://github.com/o-nly/torrent")
+   (synopsis "Torrent library for GNU Guile")
+   (description
+    "This package provides facilities for working with `.torrent' or metainfo
+files. Implements a bencode reader and writer according to Bitorrent BEP003.")

You can squash the other patch you sent fixing the description with this
one.

Mathieu

[bug#40038] [PATCH] gnu: guile-torrent: Update to 0.1.3-candidate.

[Amar M. Singh]

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


Minor fix in Guile-Torrent's configure.ac file:
- GUILE_PROGS(2.0.14)
+ GUILE_PROGS

Should help building with guile-next.

Thanks,
Amar


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-guile-torrent-Update-to-0.1.3-candidate.patch --]
[-- Type: text/x-patch, Size: 1343 bytes --]

From ebdeca5cdf83c597c309985cade3d388c3a73014 Mon Sep 17 00:00:00 2001
From: Amar Singh <nly@disroot.org>
Date: Thu, 12 Mar 2020 17:22:36 +0530
Subject: [PATCH] gnu: guile-torrent: Update to 0.1.3-candidate.

Minor release for GNU Guix.

* gnu/packages/guile-xyz.scm (guile-torrent): Update to 0.1.3-candidate.
---
 gnu/packages/guile-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index e214fe45b0..7ca07ed7ff 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3112,7 +3112,7 @@ over, or update a value in arbitrary data structures.")
 
 (define-public guile-torrent
   (package (name "guile-torrent")
-   (version "0.1-preview")
+   (version "0.1.3-candidate")
    (source (origin (method git-fetch)
                    (uri (git-reference
                          (url
@@ -3121,7 +3121,7 @@ over, or update a value in arbitrary data structures.")
                    (file-name (git-file-name name version))
                    (sha256
                     (base32
-                     "0rim8gr0cpnm1lixihsjpzg5z3i44vhqgj0dv6z7xj6jiwrmi9pw"))))
+                     "1yiagi55ncq1x7s9n7salzywjm4l96y3n7y3s47a9anvz87mrmim"))))
    (build-system gnu-build-system)
    (native-inputs
     `(("autoconf" ,autoconf)
-- 
2.25.1

[bug#40038] [PATCH] gnu: guile-torrent formatting and copyright year update

[Amar M. Singh]

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


Copyright year update, 2020.
Re-format whitespace with Emacs.
guile-gcrypt is propagated-input.

Thanks,
Amar


[-- Attachment #2: 0001-gnu-guile-torrent-formatting-and-copyright-year-upda.patch --]
[-- Type: text/x-patch, Size: 3296 bytes --]

From 16ded7a3fe410b9bdee925ac64bc5d6638deb7d4 Mon Sep 17 00:00:00 2001
From: Amar Singh <nly@disroot.org>
Date: Thu, 12 Mar 2020 17:37:01 +0530
Subject: [PATCH] gnu: guile-torrent formatting and copyright year update

---
 gnu/packages/guile-xyz.scm | 55 +++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 7ca07ed7ff..b384670e4e 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -21,7 +21,7 @@
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
 ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2019 swedebugia <swedebugia@riseup.net>
-;;; Copyright © 2019 Amar Singh <nly@disroot.org>
+;;; Copyright © 2019, 2020 Amar Singh <nly@disroot.org>
 ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -3111,30 +3111,31 @@ over, or update a value in arbitrary data structures.")
       (license license:gpl3+))))
 
 (define-public guile-torrent
-  (package (name "guile-torrent")
-   (version "0.1.3-candidate")
-   (source (origin (method git-fetch)
-                   (uri (git-reference
-                         (url
-                          "https://github.com/o-nly/torrent.git")
-                         (commit version)))
-                   (file-name (git-file-name name version))
-                   (sha256
-                    (base32
-                     "1yiagi55ncq1x7s9n7salzywjm4l96y3n7y3s47a9anvz87mrmim"))))
-   (build-system gnu-build-system)
-   (native-inputs
-    `(("autoconf" ,autoconf)
-      ("automake" ,automake)
-      ("guile" ,guile-2.2)
-      ("texinfo" ,texinfo)
-      ("perl" ,perl)
-      ("pkg-config" ,pkg-config)))
-   (inputs
-    `(("guile-gcrypt" ,guile-gcrypt)))
-   (home-page "https://github.com/o-nly/torrent")
-   (synopsis "Torrent library for GNU Guile")
-   (description
-    "This package provides facilities for working with @code{.torrent} or metainfo
+  (package
+    (name "guile-torrent")
+    (version "0.1.3-candidate")
+    (source (origin (method git-fetch)
+                    (uri (git-reference
+                          (url
+                           "https://github.com/o-nly/torrent.git")
+                          (commit version)))
+                    (file-name (git-file-name name version))
+                    (sha256
+                     (base32
+                      "1yiagi55ncq1x7s9n7salzywjm4l96y3n7y3s47a9anvz87mrmim"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("guile" ,guile-2.2)
+       ("texinfo" ,texinfo)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
+    (propagated-inputs
+     `(("guile-gcrypt" ,guile-gcrypt)))
+    (home-page "https://github.com/o-nly/torrent")
+    (synopsis "Torrent library for GNU Guile")
+    (description
+     "This package provides facilities for working with @code{.torrent} or metainfo
 files.  Implements a bencode reader and writer according to Bitorrent BEP003.")
-   (license license:gpl3+)))
+    (license license:gpl3+)))
-- 
2.25.1

[bug#40038] [PATCH] [SQUASHED] gnu: add guile-torrent

[Amar M. Singh]

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


Squashed the patches.

Thanks,
Amar


[-- Attachment #2: 0001-gnu-Add-guile-torrent.patch --]
[-- Type: text/x-patch, Size: 2444 bytes --]

From 6d313ab9a7bde4854a0a7eeecca97c43973b64be Mon Sep 17 00:00:00 2001
From: Amar Singh <nly@disroot.org>
Date: Thu, 12 Mar 2020 16:25:33 +0530
Subject: [PATCH] gnu: Add guile-torrent.

* gnu/packages/guile-xyz.scm (guile-torrent): New variable.
---
 gnu/packages/guile-xyz.scm | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 37a5198e4e..b384670e4e 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -21,7 +21,7 @@
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
 ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2019 swedebugia <swedebugia@riseup.net>
-;;; Copyright © 2019 Amar Singh <nly@disroot.org>
+;;; Copyright © 2019, 2020 Amar Singh <nly@disroot.org>
 ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -3109,3 +3109,33 @@ currently a re-implementation of the lentes library for Clojure.  Lenses
 provide composable procedures, which can be used to focus, apply functions
 over, or update a value in arbitrary data structures.")
       (license license:gpl3+))))
+
+(define-public guile-torrent
+  (package
+    (name "guile-torrent")
+    (version "0.1.3-candidate")
+    (source (origin (method git-fetch)
+                    (uri (git-reference
+                          (url
+                           "https://github.com/o-nly/torrent.git")
+                          (commit version)))
+                    (file-name (git-file-name name version))
+                    (sha256
+                     (base32
+                      "1yiagi55ncq1x7s9n7salzywjm4l96y3n7y3s47a9anvz87mrmim"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("guile" ,guile-2.2)
+       ("texinfo" ,texinfo)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
+    (propagated-inputs
+     `(("guile-gcrypt" ,guile-gcrypt)))
+    (home-page "https://github.com/o-nly/torrent")
+    (synopsis "Torrent library for GNU Guile")
+    (description
+     "This package provides facilities for working with @code{.torrent} or metainfo
+files.  Implements a bencode reader and writer according to Bitorrent BEP003.")
+    (license license:gpl3+)))
-- 
2.25.1

[bug#40038] [PATCH] gnu: guile-torrent formatting and copyright year update

[Mathieu Othacehe]

Please do not send patches of patches as it is difficult to follow and
generates noise.

Could you also rebase your patch on top of master, as they do not apply
currently.

Thanks,

Mathieu

[bug#40038] [PATCH] gnu: Add guile-torrent.

[Amar M. Singh]

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


Resolved into tip of guix/master.

Thanks,
Amar


[-- Attachment #2: 0001-gnu-Add-guile-torrent.patch --]
[-- Type: text/x-patch, Size: 2370 bytes --]

From 6285b45a00275d3c68a63f68c1e4e2db7ee0337c Mon Sep 17 00:00:00 2001
From: Amar Singh <nly@disroot.org>
Date: Thu, 12 Mar 2020 16:25:33 +0530
Subject: [PATCH] gnu: Add guile-torrent.

* gnu/packages/guile-xyz.scm (guile-torrent): New variable.
---
 gnu/packages/guile-xyz.scm | 32 +++++++++++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index b71b0178d6..088e8068c0 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -21,7 +21,7 @@
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
 ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2019 swedebugia <swedebugia@riseup.net>
-;;; Copyright © 2019 Amar Singh <nly@disroot.org>
+;;; Copyright © 2019, 2020 Amar Singh <nly@disroot.org>
 ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -3144,3 +3144,33 @@ models and also supports a rich set of boolean query operators.")
     (inputs
      `(("guile" ,guile-next)
        ,@(alist-delete "guile" (package-inputs guile-xapian))))))
+
+(define-public guile-torrent
+  (package
+    (name "guile-torrent")
+    (version "0.1.3")
+    (source (origin (method git-fetch)
+                    (uri (git-reference
+                          (url
+                           "https://github.com/o-nly/torrent.git")
+                          (commit version)))
+                    (file-name (git-file-name name version))
+                    (sha256
+                     (base32
+                      "1yiagi55ncq1x7s9n7salzywjm4l96y3n7y3s47a9anvz87mrmim"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("guile" ,guile-2.2)
+       ("texinfo" ,texinfo)
+       ("perl" ,perl)
+       ("pkg-config" ,pkg-config)))
+    (propagated-inputs
+     `(("guile-gcrypt" ,guile-gcrypt)))
+    (home-page "https://github.com/o-nly/torrent")
+    (synopsis "Torrent library for GNU Guile")
+    (description
+     "This package provides facilities for working with @code{.torrent} or metainfo
+files.  Implements a bencode reader and writer according to Bitorrent BEP003.")
+    (license license:gpl3+)))
-- 
2.25.1

[bug#40038] [PATCH] gnu: Add guile-torrent.

[Julien Lepiller]

Le 12 mars 2020 09:38:02 GMT-04:00, nly@disroot.org a écrit :
>
>Resolved into tip of guix/master.
>
>Thanks,
>Amar

Thank you :). Don't hesitate to take from my own project if you need to. I'll see if I can contribute to your project (so we join forces instead of wasting efforts on two fronts), but I'm working on other stuff now, which is why my guile-torrent is stalled.

bug#40038: [PATCH] gnu: Add guile-torrent.

[Mathieu Othacehe]

> Resolved into tip of guix/master.

Thanks, pushed as be78906592c761aa2a67e979074561e459efdcac.

Mathieu