* [bug#34139] Update electrum, add python-aiohttp-socks and python-aiorpcx
@ 2019-01-19 23:49 Vagrant Cascadian
2019-01-25 21:20 ` Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: Vagrant Cascadian @ 2019-01-19 23:49 UTC (permalink / raw)
To: 34139
[-- Attachment #1.1: Type: text/plain, Size: 338 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-python-aiohttp-socks.patch --]
[-- Type: text/x-diff, Size: 1390 bytes --]
From 3564dce5223f99397864c90a6080ad82fa4441ce Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-Add-python-aiorpcx.patch --]
[-- Type: text/x-diff, Size: 1730 bytes --]
From 415058c95d1568c2677a424084d78d0f12e0eca8 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: 0003-gnu-electrum-Update-to-3.3.2.patch --]
[-- Type: text/x-diff, Size: 1649 bytes --]
From 9256c2bbea5d79b2ad827f9a570932be2b38acdb Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#34139] Update electrum, add python-aiohttp-socks and python-aiorpcx
2019-01-19 23:49 [bug#34139] Update electrum, add python-aiohttp-socks and python-aiorpcx Vagrant Cascadian
@ 2019-01-25 21:20 ` Ludovic Courtès
2019-01-31 22:35 ` Vagrant Cascadian
0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2019-01-25 21:20 UTC (permalink / raw)
To: Vagrant Cascadian; +Cc: 34139
Hello Vagrant,
Vagrant Cascadian <vagrant@debian.org> skribis:
> The following patches update electrum, requring updated inputs, and two
> new packages, python-aiohttp-socks and python-aiorpcx.
Nipick: could you adjust the indentation of the new packages (you can
pass them through ./etc/indent-code.el if you want¹), and make sure
descriptions contain full sentences²?
With these changes we’ll be all set. :-)
Thank you!
Ludo’.
¹ https://www.gnu.org/software/guix/manual/en/html_node/Formatting-Code.html
² https://www.gnu.org/software/guix/manual/en/html_node/Synopses-and-Descriptions.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#34139] Update electrum, add python-aiohttp-socks and python-aiorpcx
2019-01-25 21:20 ` Ludovic Courtès
@ 2019-01-31 22:35 ` Vagrant Cascadian
2019-02-09 22:32 ` bug#34139: " Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: Vagrant Cascadian @ 2019-01-31 22:35 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 34139
[-- Attachment #1.1: Type: text/plain, Size: 696 bytes --]
On 2019-01-25, Ludovic Courtès wrote:
> Vagrant Cascadian <vagrant@debian.org> skribis:
>
>> The following patches update electrum, requring updated inputs, and two
>> new packages, python-aiohttp-socks and python-aiorpcx.
New patch series...
Updated to electrum 3.3.3.
> Nipick: could you adjust the indentation of the new packages (you can
> pass them through ./etc/indent-code.el if you want¹),
Done.
> and make sure descriptions contain full sentences²?
Struggled with this a bit. Thankfully, mbakke made some minimal
suggestions in irc about fixing up the description for
python-aiohttp-socks. Hopefully that's good enough.
Thanks!
live well,
vagrant
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-python-aiohttp-socks.patch --]
[-- Type: text/x-diff, Size: 1446 bytes --]
From 65b287d82f90b821e0ef6ce21d8563e7df4607f3 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
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 97b1f0661..739f5fd8a 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 "This package provides a SOCKS proxy connector for
+aiohttp. It supports SOCKS4(a) and SOCKS5.")
+ (license license:asl2.0)))
+
(define-public python-aiodns
(package
(name "python-aiodns")
--
2.20.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-Add-python-aiorpcx.patch --]
[-- Type: text/x-diff, Size: 1768 bytes --]
From 8e1f70364b46dc416116147342a4236a4232f196 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
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 739f5fd8a..823a007ce 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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.4: 0003-gnu-electrum-Update-to-3.3.3.patch --]
[-- Type: text/x-diff, Size: 1649 bytes --]
From 54d18a3a69ebbe6430d13bbb15f603cdc31a4129 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@debian.org>
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.
---
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 250b1db14..b48aaa9c5 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -299,7 +299,7 @@ do so.")
(define-public electrum
(package
(name "electrum")
- (version "3.2.2")
+ (version "3.3.3")
(source
(origin
(method url-fetch)
@@ -308,7 +308,7 @@ do so.")
version ".tar.gz"))
(sha256
(base32
- "1fxaxlf5vm2zydj678ls3pazyriym188iwzk60kyk26cz2p3xk39"))
+ "0z2zfhyawrbzs0w1426a2w0d4wsajl34ymj77qmpm41138g2ysf2"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -326,6 +326,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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* bug#34139: Update electrum, add python-aiohttp-socks and python-aiorpcx
2019-01-31 22:35 ` Vagrant Cascadian
@ 2019-02-09 22:32 ` Ludovic Courtès
2019-02-10 5:43 ` [bug#34139] " Vagrant Cascadian
0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2019-02-09 22:32 UTC (permalink / raw)
To: Vagrant Cascadian; +Cc: 34139-done
Hello,
Vagrant Cascadian <vagrant@debian.org> skribis:
> From 65b287d82f90b821e0ef6ce21d8563e7df4607f3 Mon Sep 17 00:00:00 2001
> From: Vagrant Cascadian <vagrant@debian.org>
> 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 <vagrant@debian.org>
> 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 <vagrant@debian.org>
> 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’.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#34139] Update electrum, add python-aiohttp-socks and python-aiorpcx
2019-02-09 22:32 ` bug#34139: " Ludovic Courtès
@ 2019-02-10 5:43 ` Vagrant Cascadian
2019-02-11 16:28 ` Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: Vagrant Cascadian @ 2019-02-10 5:43 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 34139-done
[-- Attachment #1: Type: text/plain, Size: 987 bytes --]
On 2019-02-09, Ludovic Courtès wrote:
> Vagrant Cascadian <vagrant@debian.org> skribis:
>> Subject: [PATCH 1/3] gnu: Add python-aiohttp-socks.
>> Subject: [PATCH 2/3] gnu: Add python-aiorpcx.
>> Subject: [PATCH 3/3] gnu: electrum: Update to 3.3.3.
...
> 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!
Thanks!
> Unfortunately qtwebkit, a dependency of Electrum, currently fails to
> build on ‘master’:
...
> See
> <https://ci.guix.info/log/901miwpk9srhwq3646v6bm7zni3qda8m-qtwebkit-5.212.0-alpha2>.
FWIW, I was eventually able to build qtwebkit locally after freeing up
some disk space; it takes at *least* 12GB free to build, in my
experience... saw the build go as high as ~11.5GB at one point, don't
know how much it eventually needed.
So I've managed to install the new version of electrum without local
patches!
live well,
vagrant
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#34139] Update electrum, add python-aiohttp-socks and python-aiorpcx
2019-02-10 5:43 ` [bug#34139] " Vagrant Cascadian
@ 2019-02-11 16:28 ` Ludovic Courtès
0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2019-02-11 16:28 UTC (permalink / raw)
To: Vagrant Cascadian; +Cc: 34139-done
Hi Vagrant,
Vagrant Cascadian <vagrant@debian.org> skribis:
> On 2019-02-09, Ludovic Courtès wrote:
>> Vagrant Cascadian <vagrant@debian.org> skribis:
[...]
>> Unfortunately qtwebkit, a dependency of Electrum, currently fails to
>> build on ‘master’:
> ...
>> See
>> <https://ci.guix.info/log/901miwpk9srhwq3646v6bm7zni3qda8m-qtwebkit-5.212.0-alpha2>.
>
> FWIW, I was eventually able to build qtwebkit locally after freeing up
> some disk space; it takes at *least* 12GB free to build, in my
> experience... saw the build go as high as ~11.5GB at one point, don't
> know how much it eventually needed.
In the meantime I also fixed the qtwebkit issue:
https://issues.guix.info/issue/34062
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-02-11 16:29 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-19 23:49 [bug#34139] Update electrum, add python-aiohttp-socks and python-aiorpcx Vagrant Cascadian
2019-01-25 21:20 ` Ludovic Courtès
2019-01-31 22:35 ` Vagrant Cascadian
2019-02-09 22:32 ` bug#34139: " Ludovic Courtès
2019-02-10 5:43 ` [bug#34139] " Vagrant Cascadian
2019-02-11 16:28 ` Ludovic Courtès
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.