* [bug#30159] [PATCH 1/2] gnu: Add deluge.
@ 2018-01-18 15:03 mike rosset
2018-01-18 15:03 ` [bug#30159] [PATCH 2/2] gnu: Add python2-libtorrent mike rosset
` (3 more replies)
0 siblings, 4 replies; 12+ messages in thread
From: mike rosset @ 2018-01-18 15:03 UTC (permalink / raw)
To: 30159; +Cc: mike.rosset
* 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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#30159] [PATCH 2/2] gnu: Add python2-libtorrent.
2018-01-18 15:03 [bug#30159] [PATCH 1/2] gnu: Add deluge mike rosset
@ 2018-01-18 15:03 ` mike rosset
2018-01-18 19:13 ` Danny Milosavljevic
2018-01-18 16:56 ` [bug#30159] [PATCH 1/2] gnu: Add deluge Danny Milosavljevic
` (2 subsequent siblings)
3 siblings, 1 reply; 12+ messages in thread
From: mike rosset @ 2018-01-18 15:03 UTC (permalink / raw)
To: 30159; +Cc: mike.rosset
* 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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#30159] [PATCH 1/2] gnu: Add deluge.
2018-01-18 15:03 [bug#30159] [PATCH 1/2] gnu: Add deluge mike rosset
2018-01-18 15:03 ` [bug#30159] [PATCH 2/2] gnu: Add python2-libtorrent mike rosset
@ 2018-01-18 16:56 ` Danny Milosavljevic
2018-01-30 21:09 ` Ludovic Courtès
2018-11-22 8:14 ` Nam Nguyen
2018-11-22 9:49 ` [bug#30159] [PATCH] " Nam Nguyen
3 siblings, 1 reply; 12+ messages in thread
From: Danny Milosavljevic @ 2018-01-18 16:56 UTC (permalink / raw)
To: mike rosset; +Cc: 30159
Hi,
thanks for the patch.
On Thu, 18 Jan 2018 07:03:50 -0800
mike rosset <mike.rosset@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.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [bug#30159] [PATCH 2/2] gnu: Add python2-libtorrent.
2018-01-18 15:03 ` [bug#30159] [PATCH 2/2] gnu: Add python2-libtorrent mike rosset
@ 2018-01-18 19:13 ` Danny Milosavljevic
0 siblings, 0 replies; 12+ messages in thread
From: Danny Milosavljevic @ 2018-01-18 19:13 UTC (permalink / raw)
To: mike rosset; +Cc: 30159
> +(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)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [bug#30159] [PATCH 1/2] gnu: Add deluge.
2018-01-18 16:56 ` [bug#30159] [PATCH 1/2] gnu: Add deluge Danny Milosavljevic
@ 2018-01-30 21:09 ` Ludovic Courtès
0 siblings, 0 replies; 12+ messages in thread
From: Ludovic Courtès @ 2018-01-30 21:09 UTC (permalink / raw)
To: mike rosset; +Cc: 30159
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@scratchpost.org> skribis:
> Hi,
>
> thanks for the patch.
>
> On Thu, 18 Jan 2018 07:03:50 -0800
> mike rosset <mike.rosset@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.
^ permalink raw reply [flat|nested] 12+ messages in thread
* [bug#30159] [PATCH 1/2] gnu: Add deluge.
2018-01-18 15:03 [bug#30159] [PATCH 1/2] gnu: Add deluge mike rosset
2018-01-18 15:03 ` [bug#30159] [PATCH 2/2] gnu: Add python2-libtorrent mike rosset
2018-01-18 16:56 ` [bug#30159] [PATCH 1/2] gnu: Add deluge Danny Milosavljevic
@ 2018-11-22 8:14 ` Nam Nguyen
2018-11-22 8:30 ` Nam Nguyen
2018-11-24 0:56 ` bug#30159: " Marius Bakke
2018-11-22 9:49 ` [bug#30159] [PATCH] " Nam Nguyen
3 siblings, 2 replies; 12+ messages in thread
From: Nam Nguyen @ 2018-11-22 8:14 UTC (permalink / raw)
To: 30159; +Cc: mike.rosset
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@0.2.9
guix package: error: ... propagated from zathura@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@2.24.0
guix package: error: ... propagated from deluge@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@1.14.10 /gnu/store/r7ma8k...-cairo-1.14.10
guix package: error: ... propagated from zathura@0.4.0
guix package: error: second entry: cairo@1.14.10 /gnu/store/d8xl...-cairo-1.14.10
guix package: error: ... propagated from pango@1.42.0
guix package: error: ... propagated from gtk+@2.24.32
guix package: error: ... propagated from python2-pygtk@2.24.0
guix package: error: ... propagated from deluge@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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#30159] [PATCH 1/2] gnu: Add deluge.
2018-11-22 8:14 ` Nam Nguyen
@ 2018-11-22 8:30 ` Nam Nguyen
2018-11-24 0:56 ` bug#30159: " Marius Bakke
1 sibling, 0 replies; 12+ messages in thread
From: Nam Nguyen @ 2018-11-22 8:30 UTC (permalink / raw)
To: 30159; +Cc: mike.rosset
I noticed that I mistakenly put license instead of l for deluge's license.
It should be: (license l:gpl3+)))
^ permalink raw reply [flat|nested] 12+ messages in thread
* [bug#30159] [PATCH] gnu: Add deluge.
2018-01-18 15:03 [bug#30159] [PATCH 1/2] gnu: Add deluge mike rosset
` (2 preceding siblings ...)
2018-11-22 8:14 ` Nam Nguyen
@ 2018-11-22 9:49 ` Nam Nguyen
2018-11-22 9:49 ` [bug#30159] [PATCH] gnu: Add libtorrent-rasterbar-c++11 Nam Nguyen
2018-11-22 9:49 ` [bug#30159] [PATCH] gnu: Add python-service-identity Nam Nguyen
3 siblings, 2 replies; 12+ messages in thread
From: Nam Nguyen @ 2018-11-22 9:49 UTC (permalink / raw)
To: 30159
* 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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#30159] [PATCH] gnu: Add libtorrent-rasterbar-c++11.
2018-11-22 9:49 ` [bug#30159] [PATCH] " Nam Nguyen
@ 2018-11-22 9:49 ` Nam Nguyen
2018-11-22 9:49 ` [bug#30159] [PATCH] gnu: Add python-service-identity Nam Nguyen
1 sibling, 0 replies; 12+ messages in thread
From: Nam Nguyen @ 2018-11-22 9:49 UTC (permalink / raw)
To: 30159
* 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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [bug#30159] [PATCH] gnu: Add python-service-identity.
2018-11-22 9:49 ` [bug#30159] [PATCH] " Nam Nguyen
2018-11-22 9:49 ` [bug#30159] [PATCH] gnu: Add libtorrent-rasterbar-c++11 Nam Nguyen
@ 2018-11-22 9:49 ` Nam Nguyen
1 sibling, 0 replies; 12+ messages in thread
From: Nam Nguyen @ 2018-11-22 9:49 UTC (permalink / raw)
To: 30159
* 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
^ permalink raw reply related [flat|nested] 12+ messages in thread
* bug#30159: [PATCH 1/2] gnu: Add deluge.
2018-11-22 8:14 ` Nam Nguyen
2018-11-22 8:30 ` Nam Nguyen
@ 2018-11-24 0:56 ` Marius Bakke
2018-11-24 2:25 ` [bug#30159] " Nam Nguyen
1 sibling, 1 reply; 12+ messages in thread
From: Marius Bakke @ 2018-11-24 0:56 UTC (permalink / raw)
To: Nam Nguyen, 30159-done; +Cc: mike.rosset
[-- Attachment #1: Type: text/plain, Size: 631 bytes --]
Nam Nguyen <namn@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!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* [bug#30159] [PATCH 1/2] gnu: Add deluge.
2018-11-24 0:56 ` bug#30159: " Marius Bakke
@ 2018-11-24 2:25 ` Nam Nguyen
0 siblings, 0 replies; 12+ messages in thread
From: Nam Nguyen @ 2018-11-24 2:25 UTC (permalink / raw)
To: Marius Bakke; +Cc: mike.rosset, 30159
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.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2018-11-24 2:27 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-18 15:03 [bug#30159] [PATCH 1/2] gnu: Add deluge mike rosset
2018-01-18 15:03 ` [bug#30159] [PATCH 2/2] gnu: Add python2-libtorrent mike rosset
2018-01-18 19:13 ` Danny Milosavljevic
2018-01-18 16:56 ` [bug#30159] [PATCH 1/2] gnu: Add deluge Danny Milosavljevic
2018-01-30 21:09 ` Ludovic Courtès
2018-11-22 8:14 ` Nam Nguyen
2018-11-22 8:30 ` Nam Nguyen
2018-11-24 0:56 ` bug#30159: " Marius Bakke
2018-11-24 2:25 ` [bug#30159] " Nam Nguyen
2018-11-22 9:49 ` [bug#30159] [PATCH] " Nam Nguyen
2018-11-22 9:49 ` [bug#30159] [PATCH] gnu: Add libtorrent-rasterbar-c++11 Nam Nguyen
2018-11-22 9:49 ` [bug#30159] [PATCH] gnu: Add python-service-identity Nam Nguyen
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).