GNU bug report logs - #30159
[PATCH 1/2] gnu: Add deluge.

Previous Next

Package: guix-patches;

Reported by: mike rosset <mike.rosset <at> gmail.com>

Date: Thu, 18 Jan 2018 16:27:01 UTC

Severity: normal

Tags: moreinfo, patch

Done: Marius Bakke <mbakke <at> fastmail.com>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30159 in the body.
You can then email your comments to 30159 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#30159; Package guix-patches. (Thu, 18 Jan 2018 16:27:02 GMT) Full text and rfc822 format available.

Acknowledgement sent to mike rosset <mike.rosset <at> gmail.com>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Thu, 18 Jan 2018 16:27:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: mike rosset <mike.rosset <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: mike.rosset <at> gmail.com
Subject: [PATCH 1/2] gnu: Add deluge.
Date: Thu, 18 Jan 2018 07:03:50 -0800
* gnu/packages/bittorrent.scm (deluge): New variable.
---
 gnu/packages/bittorrent.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 053988c8d..17c72a635 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -41,6 +41,7 @@
   #:use-module (gnu packages cyrus-sasl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages file)
+  #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages gnupg)
@@ -53,6 +54,7 @@
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
+  #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages ssh)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages xml))
@@ -408,3 +410,35 @@ desktops.")
     (license l:bsd-2)))
 
 
+(define-public deluge
+  (package
+    (name "deluge")
+    (version "1.3.15")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://download.deluge-torrent.org/source/deluge-"
+             version ".tar.xz"))
+       (sha256
+        (base32
+         "0b7rri4x0wrcj7rjghrnw1kfrsd5i7i6aq85dsg5dg1w1qa0ar59"))))
+    (build-system python-build-system)
+    (inputs `(("libtorrent-rasterbar" ,libtorrent-rasterbar)))
+    (propagated-inputs
+     `(("python2-pygtk" ,python2-pygtk)
+       ("python2-chardet" ,python2-chardet)
+       ("python2-pyopenssl" ,python2-pyopenssl)
+       ("python2-libtorrent" ,python2-libtorrent)
+       ("python2-twisted" ,python2-twisted)
+       ("python2-pyxdg" ,python2-pyxdg)))
+    (arguments
+     `(#:python ,python-2))
+    (home-page "http://deluge-torrent.org/")
+    (synopsis  "Fully-featured cross-platform BitTorrent client")
+    (description
+     "Deluge contains the common features to BitTorrent clients such as
+Protocol Encryption, DHT, Local Peer Discovery (LSD), Peer Exchange (PEX),
+UPnP, NAT-PMP, Proxy support, Web seeds, global and per-torrent speed limits.
+As Deluge heavily utilises the libtorrent library")
+    (license l:gpl3+)))
-- 
2.15.1





Information forwarded to guix-patches <at> gnu.org:
bug#30159; Package guix-patches. (Thu, 18 Jan 2018 16:42:01 GMT) Full text and rfc822 format available.

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: mike rosset <mike.rosset <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: mike.rosset <at> gmail.com
Subject: [PATCH 2/2] gnu: Add python2-libtorrent.
Date: Thu, 18 Jan 2018 07:03:51 -0800
* gnu/packages/bittorrent.scm (python2-libtorrent): New variable.
---
 gnu/packages/bittorrent.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 17c72a635..5ce1d1361 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -409,6 +409,13 @@ focusing on efficiency and scalability.  It runs on embedded devices as well as
 desktops.")
     (license l:bsd-2)))
 
+(define-public python2-libtorrent
+  (package
+    (inherit libtorrent-rasterbar)
+    (name "python2-libtorrent")
+    (build-system python-build-system)
+    (arguments `(#:python ,python-2))
+    (synopsis "python bindings for libtorrent")))
 
 (define-public deluge
   (package
-- 
2.15.1





Information forwarded to guix-patches <at> gnu.org:
bug#30159; Package guix-patches. (Thu, 18 Jan 2018 16:58:02 GMT) Full text and rfc822 format available.

Message #11 received at 30159 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: mike rosset <mike.rosset <at> gmail.com>
Cc: 30159 <at> debbugs.gnu.org
Subject: Re: [bug#30159] [PATCH 1/2] gnu: Add deluge.
Date: Thu, 18 Jan 2018 17:56:59 +0100
Hi,

thanks for the patch.

On Thu, 18 Jan 2018 07:03:50 -0800
mike rosset <mike.rosset <at> gmail.com> wrote:

> * gnu/packages/bittorrent.scm (deluge): New variable.
> ---
>  gnu/packages/bittorrent.scm | 34 ++++++++++++++++++++++++++++++++++
>  1 file changed, 34 insertions(+)
> 
> diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
> index 053988c8d..17c72a635 100644
> --- a/gnu/packages/bittorrent.scm
> +++ b/gnu/packages/bittorrent.scm
> @@ -41,6 +41,7 @@
>    #:use-module (gnu packages cyrus-sasl)
>    #:use-module (gnu packages databases)
>    #:use-module (gnu packages file)
> +  #:use-module (gnu packages freedesktop)
>    #:use-module (gnu packages glib)
>    #:use-module (gnu packages gnome)
>    #:use-module (gnu packages gnupg)
> @@ -53,6 +54,7 @@
>    #:use-module (gnu packages ncurses)
>    #:use-module (gnu packages pkg-config)
>    #:use-module (gnu packages python)
> +  #:use-module (gnu packages python-crypto)
>    #:use-module (gnu packages ssh)
>    #:use-module (gnu packages tls)
>    #:use-module (gnu packages xml))
> @@ -408,3 +410,35 @@ desktops.")
>      (license l:bsd-2)))
>  
>  
> +(define-public deluge

The name suggests that this is a program and not a library (which is fine).

> +    (propagated-inputs
> +     `(("python2-pygtk" ,python2-pygtk)
> +       ("python2-chardet" ,python2-chardet)
> +       ("python2-pyopenssl" ,python2-pyopenssl)
> +       ("python2-libtorrent" ,python2-libtorrent)
> +       ("python2-twisted" ,python2-twisted)
> +       ("python2-pyxdg" ,python2-pyxdg)))

Hmm, ok, but for programs, regular inputs would work as well.

> +As Deluge heavily utilises the libtorrent library")

^^^^ Sentence is cut.





Information forwarded to guix-patches <at> gnu.org:
bug#30159; Package guix-patches. (Thu, 18 Jan 2018 19:14:01 GMT) Full text and rfc822 format available.

Message #14 received at 30159 <at> debbugs.gnu.org (full text, mbox):

From: Danny Milosavljevic <dannym <at> scratchpost.org>
To: mike rosset <mike.rosset <at> gmail.com>
Cc: 30159 <at> debbugs.gnu.org
Subject: Re: [bug#30159] [PATCH 2/2] gnu: Add python2-libtorrent.
Date: Thu, 18 Jan 2018 20:13:08 +0100
> +(define-public python2-libtorrent
> +  (package
> +    (inherit libtorrent-rasterbar)
> +    (name "python2-libtorrent")
> +    (build-system python-build-system)
> +    (arguments `(#:python ,python-2))
> +    (synopsis "python bindings for libtorrent")))

Strange way to do that.  Does this bundle libtorrent-rasterbar?  Please unbundle it. (Try (delete-file-recursively "src") and then build the python bindings, with libtorrent-rasterbar in inputs)




Information forwarded to guix-patches <at> gnu.org:
bug#30159; Package guix-patches. (Tue, 30 Jan 2018 21:10:01 GMT) Full text and rfc822 format available.

Message #17 received at 30159 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: mike rosset <mike.rosset <at> gmail.com>
Cc: Danny Milosavljevic <dannym <at> scratchpost.org>, 30159 <at> debbugs.gnu.org
Subject: Re: [bug#30159] [PATCH 1/2] gnu: Add deluge.
Date: Tue, 30 Jan 2018 22:09:00 +0100
Hello Mike,

Could you follow up Danny’s suggestions by sending updated patches?
Looks like you’re almost there.  :-)

Thank you!

Ludo’.

Danny Milosavljevic <dannym <at> scratchpost.org> skribis:

> Hi,
>
> thanks for the patch.
>
> On Thu, 18 Jan 2018 07:03:50 -0800
> mike rosset <mike.rosset <at> gmail.com> wrote:
>
>> * gnu/packages/bittorrent.scm (deluge): New variable.
>> ---
>>  gnu/packages/bittorrent.scm | 34 ++++++++++++++++++++++++++++++++++
>>  1 file changed, 34 insertions(+)
>> 
>> diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
>> index 053988c8d..17c72a635 100644
>> --- a/gnu/packages/bittorrent.scm
>> +++ b/gnu/packages/bittorrent.scm
>> @@ -41,6 +41,7 @@
>>    #:use-module (gnu packages cyrus-sasl)
>>    #:use-module (gnu packages databases)
>>    #:use-module (gnu packages file)
>> +  #:use-module (gnu packages freedesktop)
>>    #:use-module (gnu packages glib)
>>    #:use-module (gnu packages gnome)
>>    #:use-module (gnu packages gnupg)
>> @@ -53,6 +54,7 @@
>>    #:use-module (gnu packages ncurses)
>>    #:use-module (gnu packages pkg-config)
>>    #:use-module (gnu packages python)
>> +  #:use-module (gnu packages python-crypto)
>>    #:use-module (gnu packages ssh)
>>    #:use-module (gnu packages tls)
>>    #:use-module (gnu packages xml))
>> @@ -408,3 +410,35 @@ desktops.")
>>      (license l:bsd-2)))
>>  
>>  
>> +(define-public deluge
>
> The name suggests that this is a program and not a library (which is fine).
>
>> +    (propagated-inputs
>> +     `(("python2-pygtk" ,python2-pygtk)
>> +       ("python2-chardet" ,python2-chardet)
>> +       ("python2-pyopenssl" ,python2-pyopenssl)
>> +       ("python2-libtorrent" ,python2-libtorrent)
>> +       ("python2-twisted" ,python2-twisted)
>> +       ("python2-pyxdg" ,python2-pyxdg)))
>
> Hmm, ok, but for programs, regular inputs would work as well.
>
>> +As Deluge heavily utilises the libtorrent library")
>
> ^^^^ Sentence is cut.




Added tag(s) moreinfo. Request was from ludo <at> gnu.org (Ludovic Courtès) to control <at> debbugs.gnu.org. (Tue, 27 Feb 2018 09:33:01 GMT) Full text and rfc822 format available.

Information forwarded to guix-patches <at> gnu.org:
bug#30159; Package guix-patches. (Thu, 22 Nov 2018 08:15:01 GMT) Full text and rfc822 format available.

Message #22 received at 30159 <at> debbugs.gnu.org (full text, mbox):

From: Nam Nguyen <namn <at> berkeley.edu>
To: 30159 <at> debbugs.gnu.org
Cc: dannym <at> scratchpost.org, mike.rosset <at> gmail.com
Subject: Re: [bug#30159] [PATCH 1/2] gnu: Add deluge.
Date: Thu, 22 Nov 2018 00:14:42 -0800
Hi all,

I used Mike's work to successfully write a recipe for deluge. I hope this
is the correct place to post these patches.

python2-service-identity is added so that deluge can verify TLS certificates
with pyopenssl.

libtorrent-rasterbar-c++11 needed to be patched to avoid an error while running deluge:
ImportError:
/gnu/store/...-libtorrent-rasterbar-1.1.8/lib/python2.7/site-packages/libtorrent.so:
undefined symbol: libtorrent session_handle wait_for_alert boost chrono duration ratio
(I simplified the output.)

I am worried that adding the c++11 flag to libtorrent-rasterbar might
affect qbitorrent, so I kept it as a new variable/variant.

I used these as references to arrive at a solution.
http://slackbuilds.org/slackbuilds/14.2/network/deluge/deluge.SlackBuild
http://slackbuilds.org/slackbuilds/14.2/libraries/libtorrent-rasterbar/libtorrent-rasterbar.SlackBuild
https://github.com/qbittorrent/qBittorrent/issues/6383#issuecomment-281535787

> Hmm, ok, but for programs, regular inputs would work as well.

Per Danny's suggestion, I had to changed the propagated-inputs into
inputs. Leaving it as propagated-inputs led to a gtk+ conflict:

----8<------------------------------------------------------------
$ guix package -i zathura
The following package will be installed:
   zathura      0.4.0   /gnu/store/1y31a6iqpq74py6msdvgbvkkb76rwj1s-zathura-0.4.0

guix package: error: profile contains conflicting entries for gtk+
guix package: error:   first entry: gtk+@3.22.30 /gnu/store/m2a5...-gtk+-3.22.30
guix package: error:    ... propagated from girara <at> 0.2.9
guix package: error:    ... propagated from zathura <at> 0.4.0
guix package: error:   second entry: gtk+@2.24.32 /gnu/store/68k5...-gtk+-2.24.32
guix package: error:    ... propagated from python2-pygtk <at> 2.24.0
guix package: error:    ... propagated from deluge <at> 1.3.15
hint: Try upgrading both `zathura' and `deluge', or remove one of them from the profile.

$ guix package -i zathura -n
The following package would be installed:
   zathura      0.4.0   /gnu/store/1xr46b5r60g046q2m053mlbkiz96fwfz-zathura-0.4.0

guix package: error: profile contains conflicting entries for cairo
guix package: error:   first entry: cairo <at> 1.14.10 /gnu/store/r7ma8k...-cairo-1.14.10
guix package: error:    ... propagated from zathura <at> 0.4.0
guix package: error:   second entry: cairo <at> 1.14.10 /gnu/store/d8xl...-cairo-1.14.10
guix package: error:    ... propagated from pango <at> 1.42.0
guix package: error:    ... propagated from gtk+@2.24.32
guix package: error:    ... propagated from python2-pygtk <at> 2.24.0
guix package: error:    ... propagated from deluge <at> 1.3.15
hint: Try upgrading both `zathura' and `deluge', or remove one of them from the profile.
----8<------------------------------------------------------------

I have successfully built and tested deluge. The three patches follow.

[PATCH] gnu: Add deluge.

* gnu/packages/bittorrent.scm (deluge): New variable.
---
 gnu/packages/bittorrent.scm | 39 +++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 59fbd6906..f73488ff1 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -448,3 +448,42 @@ It aims to be a good alternative to all other BitTorrent clients out there.
 qBittorrent is fast, stable and provides unicode support as well as many
 features.")
     (license l:gpl2+)))
+
+(define-public deluge
+  (package
+    (name "deluge")
+    (version "1.3.15")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://download.deluge-torrent.org/source/deluge-"
+             version ".tar.xz"))
+       (sha256
+        (base32
+         "0b7rri4x0wrcj7rjghrnw1kfrsd5i7i6aq85dsg5dg1w1qa0ar59"))))
+    (build-system python-build-system)
+    (inputs
+     `(("libtorrent-rasterbar-c++11" ,libtorrent-rasterbar-c++11)
+       ("gnu-gettext" ,gnu-gettext)
+       ("python2-chardet" ,python2-chardet)
+       ("python2-pygtk" ,python2-pygtk)
+       ("python2-pyopenssl" ,python2-pyopenssl)
+       ("python2-pyxdg" ,python2-pyxdg)
+       ("python2-service-identity" ,python2-service-identity)
+       ("python2-setuptools" ,python2-setuptools)
+       ("python2-twisted" ,python2-twisted)))
+    (native-inputs
+     `(("intltool" ,intltool)))
+    (arguments
+     `(#:python ,python-2))
+    (home-page "https://www.deluge-torrent.org/")
+    (synopsis  "Fully-featured cross-platform ​BitTorrent client")
+    (description
+     "Deluge contains the common features to BitTorrent clients such as
+Protocol Encryption, DHT, Local Peer Discovery (LSD), Peer Exchange
+(PEX), UPnP, NAT-PMP, Proxy support, Web seeds, global and per-torrent
+speed limits.  Deluge heavily utilises the ​libtorrent library.  It is
+designed to run as both a normal standalone desktop application and as a
+​client-server.")
+    (license license:gpl3+)))
-- 
2.19.1

[PATCH] gnu: Add libtorrent-rasterbar-c++11.

* gnu/packages/bittorrent.scm (libtorrent-rasterbar-c++11): New variable.
---
 gnu/packages/bittorrent.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index f73488ff1..406176692 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -406,6 +406,21 @@ focusing on efficiency and scalability.  It runs on embedded devices as well as
 desktops.")
     (license l:bsd-2)))
 
+(define-public libtorrent-rasterbar-c++11
+  (package
+    (inherit libtorrent-rasterbar)
+    (name "libtorrent-rasterbar-c++11")
+    (arguments
+     (substitute-keyword-arguments (package-arguments libtorrent-rasterbar)
+       ((#:phases phases '%standard-phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'compile-args-c++11
+             ;; https://github.com/qbittorrent/qBittorrent/issues/6383#issuecomment-281535787
+             (lambda _
+               (substitute* "bindings/python/setup.py"
+                 (("\\+ target_specific\\(\\)\\,")
+                  "+ target_specific() + ['-std=c++11'],"))))))))))
+
 (define-public qbittorrent
   (package
     (name "qbittorrent")
-- 
2.19.1

[PATCH] gnu: Add python-service-identity.

* gnu/packages/python-crypto.scm (python-service-identity,
  python2-service-identity): New variables.
---
 gnu/packages/python-crypto.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 1a70f943a..438e96822 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -970,3 +970,33 @@ been constructed to maintain extensive documentation on how to use
     (description "This is a set of Python bindings for the scrypt key
 derivation function.")
     (license license:bsd-2)))
+
+(define-public python-service-identity
+  (package
+    (name "python-service-identity")
+    (version "17.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "service_identity" version))
+       (sha256
+        (base32
+         "1aq24cn3nnsjr9g797dayhx4g653h6bd41ksqhidzq0rvarzn0a0"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-attrs" ,python-attrs)
+       ("python-pyasn1" ,python-pyasn1)
+       ("python-pyasn1-modules" ,python-pyasn1-modules)
+       ("python-pyopenssl" ,python-pyopenssl)))
+    (home-page "https://service-identity.readthedocs.io/")
+    (synopsis "Service identity verification for PyOpenSSL")
+    (description
+     "@code{service_identity} aspires to give you all the tools you need
+for verifying whether a certificate is valid for the intended purposes.
+In the simplest case, this means host name verification.  However,
+service_identity implements RFC 6125 fully and plans to add other
+relevant RFCs too.")
+    (license license:expat)))
+
+(define-public python2-service-identity
+  (package-with-python2 python-service-identity))
-- 
2.19.1




Information forwarded to guix-patches <at> gnu.org:
bug#30159; Package guix-patches. (Thu, 22 Nov 2018 08:31:01 GMT) Full text and rfc822 format available.

Message #25 received at 30159 <at> debbugs.gnu.org (full text, mbox):

From: Nam Nguyen <namn <at> berkeley.edu>
To: 30159 <at> debbugs.gnu.org
Cc: dannym <at> scratchpost.org, mike.rosset <at> gmail.com
Subject: Re: [bug#30159] [PATCH 1/2] gnu: Add deluge.
Date: Thu, 22 Nov 2018 00:30:09 -0800
I noticed that I mistakenly put license instead of l for deluge's license.

It should be: (license l:gpl3+)))




Information forwarded to guix-patches <at> gnu.org:
bug#30159; Package guix-patches. (Thu, 22 Nov 2018 09:50:02 GMT) Full text and rfc822 format available.

Message #28 received at 30159 <at> debbugs.gnu.org (full text, mbox):

From: Nam Nguyen <namn <at> berkeley.edu>
To: 30159 <at> debbugs.gnu.org
Subject: [PATCH] gnu: Add deluge.
Date: Thu, 22 Nov 2018 01:49:05 -0800
* gnu/packages/bittorrent.scm (deluge): New variable.
---
 gnu/packages/bittorrent.scm | 39 +++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index 59fbd6906..f73488ff1 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -448,3 +448,42 @@ It aims to be a good alternative to all other BitTorrent clients out there.
 qBittorrent is fast, stable and provides unicode support as well as many
 features.")
     (license l:gpl2+)))
+
+(define-public deluge
+  (package
+    (name "deluge")
+    (version "1.3.15")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "http://download.deluge-torrent.org/source/deluge-"
+             version ".tar.xz"))
+       (sha256
+        (base32
+         "0b7rri4x0wrcj7rjghrnw1kfrsd5i7i6aq85dsg5dg1w1qa0ar59"))))
+    (build-system python-build-system)
+    (inputs
+     `(("libtorrent-rasterbar-c++11" ,libtorrent-rasterbar-c++11)
+       ("gnu-gettext" ,gnu-gettext)
+       ("python2-chardet" ,python2-chardet)
+       ("python2-pygtk" ,python2-pygtk)
+       ("python2-pyopenssl" ,python2-pyopenssl)
+       ("python2-pyxdg" ,python2-pyxdg)
+       ("python2-service-identity" ,python2-service-identity)
+       ("python2-setuptools" ,python2-setuptools)
+       ("python2-twisted" ,python2-twisted)))
+    (native-inputs
+     `(("intltool" ,intltool)))
+    (arguments
+     `(#:python ,python-2))
+    (home-page "https://www.deluge-torrent.org/")
+    (synopsis  "Fully-featured cross-platform ​BitTorrent client")
+    (description
+     "Deluge contains the common features to BitTorrent clients such as
+Protocol Encryption, DHT, Local Peer Discovery (LSD), Peer Exchange
+(PEX), UPnP, NAT-PMP, Proxy support, Web seeds, global and per-torrent
+speed limits.  Deluge heavily utilises the ​libtorrent library.  It is
+designed to run as both a normal standalone desktop application and as a
+​client-server.")
+    (license l:gpl3+)))
-- 
2.19.1





Information forwarded to guix-patches <at> gnu.org:
bug#30159; Package guix-patches. (Thu, 22 Nov 2018 09:50:02 GMT) Full text and rfc822 format available.

Message #31 received at 30159 <at> debbugs.gnu.org (full text, mbox):

From: Nam Nguyen <namn <at> berkeley.edu>
To: 30159 <at> debbugs.gnu.org
Subject: [PATCH] gnu: Add libtorrent-rasterbar-c++11.
Date: Thu, 22 Nov 2018 01:49:06 -0800
* gnu/packages/bittorrent.scm (libtorrent-rasterbar-c++11): New variable.
---
 gnu/packages/bittorrent.scm | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index f73488ff1..406176692 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -406,6 +406,21 @@ focusing on efficiency and scalability.  It runs on embedded devices as well as
 desktops.")
     (license l:bsd-2)))
 
+(define-public libtorrent-rasterbar-c++11
+  (package
+    (inherit libtorrent-rasterbar)
+    (name "libtorrent-rasterbar-c++11")
+    (arguments
+     (substitute-keyword-arguments (package-arguments libtorrent-rasterbar)
+       ((#:phases phases '%standard-phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'compile-args-c++11
+             ;; https://github.com/qbittorrent/qBittorrent/issues/6383#issuecomment-281535787
+             (lambda _
+               (substitute* "bindings/python/setup.py"
+                 (("\\+ target_specific\\(\\)\\,")
+                  "+ target_specific() + ['-std=c++11'],"))))))))))
+
 (define-public qbittorrent
   (package
     (name "qbittorrent")
-- 
2.19.1





Information forwarded to guix-patches <at> gnu.org:
bug#30159; Package guix-patches. (Thu, 22 Nov 2018 09:50:03 GMT) Full text and rfc822 format available.

Message #34 received at 30159 <at> debbugs.gnu.org (full text, mbox):

From: Nam Nguyen <namn <at> berkeley.edu>
To: 30159 <at> debbugs.gnu.org
Subject: [PATCH] gnu: Add python-service-identity.
Date: Thu, 22 Nov 2018 01:49:07 -0800
* gnu/packages/python-crypto.scm (python-service-identity,
  python2-service-identity): New variables.
---
 gnu/packages/python-crypto.scm | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 1a70f943a..438e96822 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -970,3 +970,33 @@ been constructed to maintain extensive documentation on how to use
     (description "This is a set of Python bindings for the scrypt key
 derivation function.")
     (license license:bsd-2)))
+
+(define-public python-service-identity
+  (package
+    (name "python-service-identity")
+    (version "17.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "service_identity" version))
+       (sha256
+        (base32
+         "1aq24cn3nnsjr9g797dayhx4g653h6bd41ksqhidzq0rvarzn0a0"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-attrs" ,python-attrs)
+       ("python-pyasn1" ,python-pyasn1)
+       ("python-pyasn1-modules" ,python-pyasn1-modules)
+       ("python-pyopenssl" ,python-pyopenssl)))
+    (home-page "https://service-identity.readthedocs.io/")
+    (synopsis "Service identity verification for PyOpenSSL")
+    (description
+     "@code{service_identity} aspires to give you all the tools you need
+for verifying whether a certificate is valid for the intended purposes.
+In the simplest case, this means host name verification.  However,
+service_identity implements RFC 6125 fully and plans to add other
+relevant RFCs too.")
+    (license license:expat)))
+
+(define-public python2-service-identity
+  (package-with-python2 python-service-identity))
-- 
2.19.1





Reply sent to Marius Bakke <mbakke <at> fastmail.com>:
You have taken responsibility. (Sat, 24 Nov 2018 00:57:02 GMT) Full text and rfc822 format available.

Notification sent to mike rosset <mike.rosset <at> gmail.com>:
bug acknowledged by developer. (Sat, 24 Nov 2018 00:57:02 GMT) Full text and rfc822 format available.

Message #39 received at 30159-done <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Nam Nguyen <namn <at> berkeley.edu>, 30159-done <at> debbugs.gnu.org
Cc: mike.rosset <at> gmail.com
Subject: Re: [bug#30159] [PATCH 1/2] gnu: Add deluge.
Date: Sat, 24 Nov 2018 01:56:44 +0100
[Message part 1 (text/plain, inline)]
Nam Nguyen <namn <at> berkeley.edu> writes:

> Hi all,
>
> I used Mike's work to successfully write a recipe for deluge. I hope this
> is the correct place to post these patches.
>
> python2-service-identity is added so that deluge can verify TLS certificates
> with pyopenssl.

Hi Nam,

Thank you for these patches!

I've applied all three with minor changes:

* The libtorrent C++ fix was moved into libtorrent itself instead of a
  separate package.
* Dropped 'gettext' and 'setuptools' inputs from Deluge as they appeared
  unused.
* Added copyright notices for you in the relevant places.

Hope this was okay, and welcome to Guix!
[signature.asc (application/pgp-signature, inline)]

Information forwarded to guix-patches <at> gnu.org:
bug#30159; Package guix-patches. (Sat, 24 Nov 2018 02:27:02 GMT) Full text and rfc822 format available.

Message #42 received at 30159 <at> debbugs.gnu.org (full text, mbox):

From: Nam Nguyen <namn <at> berkeley.edu>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: mike.rosset <at> gmail.com, 30159 <at> debbugs.gnu.org
Subject: Re: [bug#30159] [PATCH 1/2] gnu: Add deluge.
Date: Fri, 23 Nov 2018 18:25:49 -0800
Hi Marius,

> * Dropped 'gettext' and 'setuptools' inputs from Deluge as they appeared
>   unused.

As you had suggested, intltool should be removed, as well. Thank you for
your help.




bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sat, 22 Dec 2018 12:24:05 GMT) Full text and rfc822 format available.

This bug report was last modified 5 years and 125 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.