diff mbox series

[bug#34139] Update electrum, add python-aiohttp-socks and python-aiorpcx

Message ID 87h8doe9qk.fsf@ponder
State Accepted
Headers show
Series [bug#34139] Update electrum, add python-aiohttp-socks and python-aiorpcx | expand

Checks

Context Check Description
cbaines/applying patch fail Apply failed
cbaines/applying patch success Successfully applied

Commit Message

Vagrant Cascadian Jan. 31, 2019, 10:35 p.m. UTC 
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

Comments

Ludovic Courtès Feb. 9, 2019, 10:32 p.m. UTC | #1 
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’.
Vagrant Cascadian Feb. 10, 2019, 5:43 a.m. UTC | #2 
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
Ludovic Courtès Feb. 11, 2019, 4:28 p.m. UTC | #3 
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’.
diff mbox series

Patch

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