--- Begin Message ---
Subject: |
Update electrum, add python-aiohttp-socks and python-aiorpcx |
Date: |
Sat, 19 Jan 2019 15:49:49 -0800 |
The following patches update electrum, requring updated inputs, and two
new packages, python-aiohttp-socks and python-aiorpcx.
finance.scm | 8 ++++++--
python-web.scm | 45 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 2 deletions(-)
Thanks in advance for the review!
live well,
vagrant
From 3564dce5223f99397864c90a6080ad82fa4441ce Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <address@hidden>
Date: Thu, 17 Jan 2019 00:17:11 +0000
Subject: [PATCH 1/3] gnu: Add python-aiohttp-socks.
* gnu/packages/python-web.scm (python-aiohttp-socks): New variable.
---
gnu/packages/python-web.scm | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index af0595b36..3141600c6 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -102,6 +102,27 @@ Callback Hell.
@end itemize")
(license license:asl2.0)))
+(define-public python-aiohttp-socks
+(package
+ (name "python-aiohttp-socks")
+ (version "0.2.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "aiohttp_socks" version))
+ (sha256
+ (base32
+ "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-aiohttp" ,python-aiohttp)))
+ (home-page
+ "https://github.com/romis2012/aiohttp-socks")
+ (synopsis "SOCKS proxy connector for aiohttp")
+ (description "SOCKS proxy connector for aiohttp. SOCKS4(a) and SOCKS5 are
+supported.")
+ (license license:asl2.0)))
+
(define-public python-aiodns
(package
(name "python-aiodns")
--
2.20.1
From 415058c95d1568c2677a424084d78d0f12e0eca8 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <address@hidden>
Date: Thu, 17 Jan 2019 00:18:41 +0000
Subject: [PATCH 2/3] gnu: Add python-aiorpcx.
* gnu/packages/python-web.scm (python-aiorpcx): New variable.
---
gnu/packages/python-web.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 3141600c6..3caba6637 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -146,6 +146,30 @@ asynchronous DNS resolutions with a synchronous looking
interface by
using @url{https://github.com/saghul/pycares,pycares}.")
(license license:expat)))
+(define-public python-aiorpcx
+(package
+ (name "python-aiorpcx")
+ (version "0.10.2")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "aiorpcX" version))
+ (sha256
+ (base32
+ "1p88k15jh0d2a18pnnbfcamsqi2bxvmmhpizmdlxfdxf8vy5ggyj"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-attrs" ,python-attrs)))
+ (home-page
+ "https://github.com/kyuupichan/aiorpcX")
+ (synopsis
+ "Generic async RPC implementation, including JSON-RPC")
+ (description
+ "A generic asyncio library implementation of RPC suitable for an
application that is a client, server or both.
+
+The package includes a module with full coverage of JSON RPC versions 1.0 and
2.0, JSON RPC protocol auto-detection, and arbitrary message framing. It also
comes with a SOCKS proxy client.")
+ (license (list license:expat license:bsd-2))))
+
(define-public python-falcon
(package
(name "python-falcon")
--
2.20.1
From 9256c2bbea5d79b2ad827f9a570932be2b38acdb Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <address@hidden>
Date: Tue, 15 Jan 2019 04:51:34 +0000
Subject: [PATCH 3/3] gnu: electrum: Update to 3.3.2.
* gnu/packages/finance.scm (electrum): Update to 3.2.2.
[inputs]: Add python-aiohttp, python-aiohttp-socks, python-aiorpcx and
python-certifi.
---
gnu/packages/finance.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 468388797..293aa1f7d 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -293,7 +293,7 @@ do so.")
(define-public electrum
(package
(name "electrum")
- (version "3.2.2")
+ (version "3.3.2")
(source
(origin
(method url-fetch)
@@ -302,7 +302,7 @@ do so.")
version ".tar.gz"))
(sha256
(base32
- "1fxaxlf5vm2zydj678ls3pazyriym188iwzk60kyk26cz2p3xk39"))
+ "0vgfdhwvrrl6dr4rd4hhxr8304bxm00sh7fw4nalm4hf7gfsbcji"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -320,6 +320,10 @@ do so.")
("python-requests" ,python-requests)
("python-qrcode" ,python-qrcode)
("python-protobuf" ,python-protobuf)
+ ("python-aiohttp" ,python-aiohttp)
+ ("python-aiohttp-socks" ,python-aiohttp-socks)
+ ("python-aiorpcx" ,python-aiorpcx)
+ ("python-certifi" ,python-certifi)
("python-dnspython" ,python-dnspython)
("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
(arguments
--
2.20.1
signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
Subject: |
Re: [bug#34139] Update electrum, add python-aiohttp-socks and python-aiorpcx |
Date: |
Sat, 09 Feb 2019 23:32:43 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
Hello,
Vagrant Cascadian <address@hidden> skribis:
> From 65b287d82f90b821e0ef6ce21d8563e7df4607f3 Mon Sep 17 00:00:00 2001
> From: Vagrant Cascadian <address@hidden>
> Date: Thu, 17 Jan 2019 00:17:11 +0000
> Subject: [PATCH 1/3] gnu: Add python-aiohttp-socks.
>
> * gnu/packages/python-web.scm (python-aiohttp-socks): New variable.
[...]
> From 8e1f70364b46dc416116147342a4236a4232f196 Mon Sep 17 00:00:00 2001
> From: Vagrant Cascadian <address@hidden>
> Date: Thu, 17 Jan 2019 00:18:41 +0000
> Subject: [PATCH 2/3] gnu: Add python-aiorpcx.
>
> * gnu/packages/python-web.scm (python-aiorpcx): New variable.
[...]
> From 54d18a3a69ebbe6430d13bbb15f603cdc31a4129 Mon Sep 17 00:00:00 2001
> From: Vagrant Cascadian <address@hidden>
> Date: Tue, 15 Jan 2019 04:51:34 +0000
> Subject: [PATCH 3/3] gnu: electrum: Update to 3.3.3.
>
> * gnu/packages/finance.scm (electrum): Update to 3.3.3.
> [inputs]: Add python-aiohttp, python-aiohttp-socks, python-aiorpcx and
> python-certifi.
I finally applied all three patches with minor tweaks to the
descriptions; I also added a copyright line for you in python-web.scm.
Sorry for the delay!
Unfortunately qtwebkit, a dependency of Electrum, currently fails to
build on ‘master’:
--8<---------------cut here---------------start------------->8---
[ 81%] Generating
../../DerivedSources/WebKit2/AuthenticationManagerMessageReceiver.cpp,
../../DerivedSources/WebKit2/AuthenticationManagerMessages.h
cd
/tmp/guix-build-qtwebkit-5.212.0-alpha2.drv-0/qtwebkit-5.212.0-alpha2/Source/WebKit2
&& /gnu/store/g87hamjyipk1j6dfq5pjfzfnfb64spbv-python2-2.7.15/bin/python2.7
/tmp/guix-build-qtwebkit-5.212.0-alpha2.drv-0/qtwebkit-5.212.0-alpha2/Source/WebKit2/Scripts/generate-message-receiver.py
Shared/Authentication/AuthenticationManager.messages.in >
/tmp/guix-build-qtwebkit-5.212.0-alpha2.drv-0/build/DerivedSources/WebKit2/AuthenticationManagerMessageReceiver.cpp
Traceback (most recent call last):
File
"/tmp/guix-build-qtwebkit-5.212.0-alpha2.drv-0/qtwebkit-5.212.0-alpha2/Source/WebKit2/Scripts/generate-message-receiver.py",
line 28, in <module>
import webkit.messages
EOFError: EOF read where object expected
cd
/tmp/guix-build-qtwebkit-5.212.0-alpha2.drv-0/qtwebkit-5.212.0-alpha2/Source/WebKit2
&& /gnu/store/g87hamjyipk1j6dfq5pjfzfnfb64spbv-python2-2.7.15/bin/python2.7
/tmp/guix-build-qtwebkit-5.212.0-alpha2.drv-0/qtwebkit-5.212.0-alpha2/Source/WebKit2/Scripts/generate-messages-header.py
NetworkProcess/NetworkResourceLoader.messages.in >
/tmp/guix-build-qtwebkit-5.212.0-alpha2.drv-0/build/DerivedSources/WebKit2/NetworkResourceLoaderMessages.h
make[2]: *** [Source/WebKit2/CMakeFiles/WebKit2.dir/build.make:194:
DerivedSources/WebKit2/ChildProcessMessageReceiver.cpp] Error 1
--8<---------------cut here---------------end--------------->8---
See
<https://ci.guix.info/log/901miwpk9srhwq3646v6bm7zni3qda8m-qtwebkit-5.212.0-alpha2>.
Interestingly this was first reported here for WebkitGTK:
<https://issues.guix.info/issue/30015>.
To be continued…
Thanks,
Ludo’.
--- End Message ---