[PATCH] gnu: electrum: Update to 4.0.5.

Done

Details

4 participants

dftxbs3e
Efraim Flashner
Léo Le Bouter
Ludovic Courtès

Owner: unassigned

Submitted by: dftxbs3e

Severity: normal

dftxbs3e wrote on 1 Dec 2020 12:53

Recipients:(address . guix-patches@gnu.org)

Message-ID:ddfb7d856c3a0a8868579d38206ff963d28df421.camel@free.fr

Hello!

Third time.. sorry.

My biggest submission so far, please review carefully I can still count

my submissions with my hand.

Please strip the first mail from the mbox when using git-am. Because

debbugs wont allow git-send-email to work without creating one bug per

patch I am sending the first email with my regular email client to

obtain the dedicated address and then using git-send-email.

Thank you.

dftxbs3e wrote on 1 Dec 2020 12:55

[PATCH 1/8] gnu: Add python-qtpy.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201201115516.265593-1-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-qtpy): New variable.

---

gnu/packages/python-xyz.scm | 24 ++++++++++++++++++++++++

1 file changed, 24 insertions(+)

Toggle diff (34 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 1086d724f1..ad51498050 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23232,3 +23232,27 @@ process.")
      "Gamera is a toolkit for building document image recognition systems.")
     (home-page "https://gamera.informatik.hsnr.de/")
     (license license:gpl2+)))
+
+(define-public python-qtpy
+  (package
+    (name "python-qtpy")
+    (version "1.9.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "QtPy" version))
+        (sha256
+          (base32
+            "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-pyside2" ,python-pyside-2)))
+    (arguments
+      `(;; Not all supported bindings are packaged. Especially PyQt4.
+	#:tests? #f))
+    (home-page "https://github.com/spyder-ide/qtpy")
+    (synopsis
+      "Provides an abstraction layer on top of the various Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
+    (description
+      "Provides an abstraction layer on top of the various Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
+    (license license:expat)))
-- 
2.28.0

dftxbs3e wrote on 1 Dec 2020 12:55

[PATCH 2/8] gnu: Add python-helpdev.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201201115516.265593-2-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-helpdev): New variable.

---

gnu/packages/python-xyz.scm | 22 ++++++++++++++++++++++

1 file changed, 22 insertions(+)

Toggle diff (32 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ad51498050..36373ae71c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23256,3 +23256,25 @@ process.")
     (description
       "Provides an abstraction layer on top of the various Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
     (license license:expat)))
+
+(define-public python-helpdev
+  (package
+    (name "python-helpdev")
+    (version "0.7.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "helpdev" version))
+        (sha256
+          (base32
+            "0gfvj28i82va7c264jl2p4cdsl3lpf9fpb9cyjnis55crfdafqmv"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-importlib-metadata"
+         ,python-importlib-metadata)))
+    (home-page "https://gitlab.com/dpizetta/helpdev")
+    (synopsis
+      "HelpDev - Extracts information about the Python environment easily.")
+    (description
+      "HelpDev - Extracts information about the Python environment easily.")
+    (license license:expat)))
-- 
2.28.0

dftxbs3e wrote on 1 Dec 2020 12:55

[PATCH 3/8] gnu: Add python-qdarkstyle.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201201115516.265593-3-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-qdarkstyle): New variable.

---

gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 36373ae71c..758496d52f 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23278,3 +23278,30 @@ process.")
     (description
       "HelpDev - Extracts information about the Python environment easily.")
     (license license:expat)))
+
+(define-public python-qdarkstyle
+  (package
+    (name "python-qdarkstyle")
+    (version "2.8.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "QDarkStyle" version))
+        (sha256
+          (base32
+            "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym"))))
+    (build-system python-build-system)
+    (arguments
+      `(;; Fails unable to detect valid Qt bindings even if you
+	;; add them as native-inputs.
+	#:tests? #f))
+    (propagated-inputs
+      `(("python-helpdev" ,python-helpdev)
+        ("python-qtpy" ,python-qtpy)))
+    (home-page
+      "https://github.com/ColinDuquesnoy/QDarkStyleSheet")
+    (synopsis
+      "The most complete dark stylesheet for Python and Qt applications")
+    (description
+      "The most complete dark stylesheet for Python and Qt applications")
+    (license license:expat)))
-- 
2.28.0

dftxbs3e wrote on 1 Dec 2020 12:55

[PATCH 4/8] gnu: Add python-bitstring.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201201115516.265593-4-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-bitstring): New variable.

---

gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++

1 file changed, 20 insertions(+)

Toggle diff (30 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 758496d52f..3c170ebe3c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23305,3 +23305,23 @@ process.")
     (description
       "The most complete dark stylesheet for Python and Qt applications")
     (license license:expat)))
+
+(define-public python-bitstring
+  (package
+    (name "python-bitstring")
+    (version "3.1.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "bitstring" version))
+        (sha256
+          (base32
+            "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx"))))
+    (build-system python-build-system)
+    (home-page
+      "https://github.com/scott-griffiths/bitstring")
+    (synopsis
+      "Simple construction, analysis and modification of binary data.")
+    (description
+      "Simple construction, analysis and modification of binary data.")
+    (license license:expat)))
-- 
2.28.0

dftxbs3e wrote on 1 Dec 2020 12:55

[PATCH 5/8] gnu: Add python-socks.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201201115516.265593-5-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-socks): New variable.

---

gnu/packages/python-xyz.scm | 26 ++++++++++++++++++++++++++

1 file changed, 26 insertions(+)

Toggle diff (36 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 3c170ebe3c..feffad00b3 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23325,3 +23325,29 @@ process.")
     (description
       "Simple construction, analysis and modification of binary data.")
     (license license:expat)))
+
+(define-public python-socks
+  (package
+    (name "python-socks")
+    (version "1.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "python-socks" version))
+        (sha256
+          (base32
+            "1y9sp0hijywjrqwpjgpq3yjmfm6s0rj1br19xm77ffk72w5pdr26"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      ;; For python-socks[asyncio]
+      `(("python-async-timeout" ,python-async-timeout)))
+    (native-inputs
+      `(("python-trio" ,python-trio)
+	("python-curio" ,python-curio)))
+    (home-page
+      "https://github.com/romis2012/python-socks")
+    (synopsis
+      "Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python")
+    (description
+      "Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python")
+    (license license:asl2.0)))
-- 
2.28.0

dftxbs3e wrote on 1 Dec 2020 12:55

[PATCH 6/8] gnu: python-aiohttp-socks: Update to 0.5.5.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201201115516.265593-6-dftxbs3e@free.fr

* gnu/packages/python-web.scm (python-aiohttp-socks):

[version]: Bump to 0.5.5.

[propagated-inputs]: Add python-socks, python-attrs.

---

gnu/packages/python-web.scm | 8 +++++---

1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (29 lines)diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 107f579ad6..797d94f12a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -166,17 +166,19 @@ Callback Hell.
 (define-public python-aiohttp-socks
   (package
     (name "python-aiohttp-socks")
-    (version "0.2.2")
+    (version "0.5.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "aiohttp_socks" version))
        (sha256
         (base32
-         "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"))))
+         "0jmhb0l1w8k1nishij3awd9zv8zbyb5l35a2pdalrqxxasbhbcif"))))
     (build-system python-build-system)
     (propagated-inputs
-     `(("python-aiohttp" ,python-aiohttp)))
+     `(("python-aiohttp" ,python-aiohttp)
+       ("python-attrs" ,python-attrs)
+       ("python-socks" ,python-socks)))
     (home-page "https://github.com/romis2012/aiohttp-socks")
     (synopsis "SOCKS proxy connector for aiohttp")
     (description "This package provides a SOCKS proxy connector for
-- 
2.28.0

dftxbs3e wrote on 1 Dec 2020 12:55

[PATCH 7/8] gnu: libsecp256k1: Update to 20200615-1-dbd41db.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201201115516.265593-7-dftxbs3e@free.fr

From: John Doe <dftxbs3e@free.fr>

* gnu/packages/crypto.scm (libsecp256k1):
[commit]: Set to "dbd41db16a0e91b2566820898a3ab2d7dad4fe00".
[version]: Bump to 20200615-1-dbd41db.
[arguments]: Add "--enable-module-recovery",
"--enable-experimental", "--enable-module-ecdh" and
"--enable-shared" to #:configure-flags.
---
 gnu/packages/crypto.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Toggle diff (35 lines)diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 1b51366d7e..f0fc1ec5a3 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1028,10 +1028,10 @@ trivial to build for local use.  Portability is emphasized over performance.")
     (license license:unlicense)))
 
 (define-public libsecp256k1
-  (let ((commit "d644dda5c9dbdecee52d1aa259235510fdc2d4ee"))
+  (let ((commit "dbd41db16a0e91b2566820898a3ab2d7dad4fe00"))
     (package
       (name "libsecp256k1")
-      (version (git-version "20191213" "1" commit))
+      (version (git-version "20200615" "1" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1039,9 +1039,14 @@ trivial to build for local use.  Portability is emphasized over performance.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0zmx32746khsm2cx0p3pdy3j2vkwmafvf7axiixijhgcg0xjv93i"))
+                  "1fcpnksq5cqwqzshn5f0lq94b73p3frwbp04hgmmbnrndpqg6mpy"))
                 (file-name (git-file-name name version))))
       (build-system gnu-build-system)
+      (arguments
+	'(#:configure-flags '("--enable-module-recovery"
+			      "--enable-experimental"
+			      "--enable-module-ecdh"
+			      "--enable-shared")))
       (native-inputs
        `(("autoconf" ,autoconf)
          ("automake" ,automake)
-- 
2.28.0

dftxbs3e wrote on 1 Dec 2020 12:55

[PATCH 8/8] gnu: electrum: Update to 4.0.5.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201201115516.265593-8-dftxbs3e@free.fr

From: John Doe <dftxbs3e@free.fr>

* gnu/packages/finance.scm (electrum): Update to 4.0.5.
[inputs]: Remove.
[propagated-inputs]: Add python-pyqt, python-ecdsa, python-qrcode,
python-protobuf, python-aiohttp, python-aiohttp-socks, python-aiorpcx,
python-certifi, python-bitstring, python-attrs, python-cryptography,
python-qdarkstyle, python-dnspython and libsecp256k1.
[arguments]: Copy 'use-libsecp256k1-input phase from
(electron-cash) to #:phases to fix runtime lookup of libsecp256k1
library.
---
 gnu/packages/finance.scm | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

Toggle diff (70 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index a79c70d1e0..e7b83eec20 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -493,7 +493,7 @@ do so.")
 (define-public electrum
   (package
     (name "electrum")
-    (version "3.3.8")
+    (version "4.0.5")
     (source
      (origin
        (method url-fetch)
@@ -501,7 +501,7 @@ do so.")
                            version "/Electrum-"
                            version ".tar.gz"))
        (sha256
-        (base32 "1g00cj1pmckd4xis8r032wmraiv3vd3zc803hnyxa2bnhj8z3bg2"))
+        (base32 "06ml9lwa5k2dp56sm5s7dsl6qirqmgim7rn853cqcq9n45z41437"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -509,22 +509,21 @@ do so.")
            (delete-file-recursively "packages")
            #t))))
     (build-system python-build-system)
-    (inputs
-     `(("python-pyaes" ,python-pyaes)
-       ("python-pysocks" ,python-pysocks)
-       ("python-sip" ,python-sip)
-       ("python-pyqt" ,python-pyqt)
+    (propagated-inputs
+     `(("python-pyqt" ,python-pyqt)
        ("python-ecdsa" ,python-ecdsa)
-       ("python-pbkdf2" ,python-pbkdf2)
-       ("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-bitstring" ,python-bitstring)
+       ("python-attrs" ,python-attrs)
+       ("python-cryptography" ,python-cryptography)
+       ("python-qdarkstyle" ,python-qdarkstyle)
        ("python-dnspython" ,python-dnspython)
-       ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
+       ("libsecp256k1" ,libsecp256k1)))
     (arguments
      `(#:tests? #f                      ; no tests
        #:phases
@@ -538,7 +537,14 @@ do so.")
                (substitute* "setup.py"
                  (("sys\\.prefix")
                   (format #f "\"~a\"" out)))
-               #t))))))
+               #t)))
+         (add-after 'unpack 'use-libsecp256k1-input
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "electrum/ecc_fast.py"
+               (("library_paths = .* 'libsecp256k1.so.0'.")
+                (string-append "library_paths = ('"
+                               (assoc-ref inputs "libsecp256k1")
+                               "/lib/libsecp256k1.so.0'"))))))))
     (home-page "https://electrum.org/")
     (synopsis "Bitcoin wallet")
     (description
-- 
2.28.0

Ludovic Courtès wrote on 11 Dec 2020 18:43

Re: [bug#44990] [PATCH] gnu: electrum: Update to 4.0.5.

Recipients:(name . dftxbs3e)(address . dftxbs3e@free.fr)(address . 44990@debbugs.gnu.org)

Message-ID:874kks5jch.fsf@gnu.org

Hi!

dftxbs3e <dftxbs3e@free.fr> skribis:

Toggle quote (10 lines)> Third time.. sorry.
>
> My biggest submission so far, please review carefully I can still count
> my submissions with my hand.
>
> Please strip the first mail from the mbox when using git-am. Because
> debbugs wont allow git-send-email to work without creating one bug per
> patch I am sending the first email with my regular email client to
> obtain the dedicated address and then using git-send-email.

Yeah, the (annoying) trick is to send the cover letter, get the number,

and then send the actual series:

https://guix.gnu.org/manual/devel/en/html_node/Submitting-Patches.html

Overall the series LGTM. A couple of comments:

1. Could you please improve synopses and suggestions a bit, according

to the guidelines at

https://guix.gnu.org/manual/en/html_node/Synopses-and-Descriptions.html,

and wrap lines to 80 chars? Don’t lose your hair on it but at

least make sure to have full sentences in descriptions and so on.

2. The last patch moves a large chunks of eletrum ‘inputs’ to

‘propagated-inputs’. If you are sure this is justified, please add

a comment right above the ‘propagated-inputs’ field explaining

why. However, it may not be a good idea to propagate that much as

it “pollutes” the profile of users who install ‘electrum’, can lead

to collisions, etc.

Could you send a v2?

Thanks!

Ludo’.

John Doe wrote on 11 Dec 2020 21:18

[PATCH v2 1/8] gnu: Add python-qtpy.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211201833.22529-1-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-qtpy): New variable.

---

gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (35 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d312e3172a..a92898c7f0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23222,3 +23222,28 @@ process.")
      "Gamera is a toolkit for building document image recognition systems.")
     (home-page "https://gamera.informatik.hsnr.de/")
     (license license:gpl2+)))
+
+(define-public python-qtpy
+  (package
+    (name "python-qtpy")
+    (version "1.9.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "QtPy" version))
+        (sha256
+          (base32
+            "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-pyside2" ,python-pyside-2)))
+    (arguments
+      `(;; Not all supported bindings are packaged. Especially PyQt4.
+	#:tests? #f))
+    (home-page "https://github.com/spyder-ide/qtpy")
+    (synopsis
+     "Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets")
+    (description
+     "Provides an abstraction layer on top of the various Qt bindings
+(PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
+    (license license:expat)))
-- 
2.29.2

John Doe wrote on 11 Dec 2020 21:18

[PATCH v2 2/8] gnu: Add python-helpdev.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211201833.22529-2-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-helpdev): New variable.

---

gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++

1 file changed, 23 insertions(+)

Toggle diff (33 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a92898c7f0..c3e55f5aff 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23247,3 +23247,26 @@ process.")
      "Provides an abstraction layer on top of the various Qt bindings
 (PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
     (license license:expat)))
+
+(define-public python-helpdev
+  (package
+    (name "python-helpdev")
+    (version "0.7.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "helpdev" version))
+        (sha256
+          (base32
+            "0gfvj28i82va7c264jl2p4cdsl3lpf9fpb9cyjnis55crfdafqmv"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-importlib-metadata"
+         ,python-importlib-metadata)))
+    (home-page "https://gitlab.com/dpizetta/helpdev")
+    (synopsis
+      "Extracts information about the Python environment easily")
+    (description
+      "Helpdev is a library to easily extract information about the Python
+environment.")
+    (license license:expat)))
-- 
2.29.2

John Doe wrote on 11 Dec 2020 21:18

[PATCH v2 3/8] gnu: Add python-qdarkstyle.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211201833.22529-3-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-qdarkstyle): New variable.

---

gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c3e55f5aff..c3591f53b4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23270,3 +23270,30 @@ process.")
       "Helpdev is a library to easily extract information about the Python
 environment.")
     (license license:expat)))
+
+(define-public python-qdarkstyle
+  (package
+    (name "python-qdarkstyle")
+    (version "2.8.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "QDarkStyle" version))
+        (sha256
+          (base32
+            "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym"))))
+    (build-system python-build-system)
+    (arguments
+      `(;; Fails unable to detect valid Qt bindings even if you
+	;; add them as native-inputs.
+	#:tests? #f))
+    (propagated-inputs
+      `(("python-helpdev" ,python-helpdev)
+        ("python-qtpy" ,python-qtpy)))
+    (home-page
+      "https://github.com/ColinDuquesnoy/QDarkStyleSheet")
+    (synopsis
+      "Complete dark stylesheet for Python and Qt applications")
+    (description
+      "QDarkStyle is the most complete dark stylesheet for Python and Qt applications.")
+    (license license:expat)))
-- 
2.29.2

John Doe wrote on 11 Dec 2020 21:18

[PATCH v2 4/8] gnu: Add python-bitstring.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211201833.22529-4-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-bitstring): New variable.

---

gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++

1 file changed, 21 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c3591f53b4..4f55ed2e83 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23297,3 +23297,24 @@ environment.")
     (description
       "QDarkStyle is the most complete dark stylesheet for Python and Qt applications.")
     (license license:expat)))
+
+(define-public python-bitstring
+  (package
+    (name "python-bitstring")
+    (version "3.1.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "bitstring" version))
+        (sha256
+          (base32
+            "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx"))))
+    (build-system python-build-system)
+    (home-page
+      "https://github.com/scott-griffiths/bitstring")
+    (synopsis
+      "Simple construction, analysis and modification of binary data")
+    (description
+      "Bitstring is a library for simple construction, analysis and modification
+ of binary data.")
+    (license license:expat)))
-- 
2.29.2

John Doe wrote on 11 Dec 2020 21:18

[PATCH v2 5/8] gnu: Add python-socks.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211201833.22529-5-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-socks): New variable.

---

gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4f55ed2e83..426c2b853d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23318,3 +23318,30 @@ environment.")
       "Bitstring is a library for simple construction, analysis and modification
  of binary data.")
     (license license:expat)))
+
+(define-public python-socks
+  (package
+    (name "python-socks")
+    (version "1.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "python-socks" version))
+        (sha256
+          (base32
+            "1y9sp0hijywjrqwpjgpq3yjmfm6s0rj1br19xm77ffk72w5pdr26"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      ;; For python-socks[asyncio]
+      `(("python-async-timeout" ,python-async-timeout)))
+    (native-inputs
+      `(("python-trio" ,python-trio)
+	("python-curio" ,python-curio)))
+    (home-page
+      "https://github.com/romis2012/python-socks")
+    (synopsis
+      "Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python")
+    (description
+      "Socks is a library providing core proxy (SOCKS4, SOCKS5, HTTP tunneling)
+ functionality.")
+    (license license:asl2.0)))
-- 
2.29.2

John Doe wrote on 11 Dec 2020 21:18

[PATCH v2 6/8] gnu: python-aiohttp-socks: Update to 0.5.5.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211201833.22529-6-dftxbs3e@free.fr

* gnu/packages/python-web.scm (python-aiohttp-socks):
[version]: Bump to 0.5.5.
[propagated-inputs]: Add python-socks, python-attrs.
---
 gnu/packages/python-web.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (29 lines)diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 107f579ad6..797d94f12a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -166,17 +166,19 @@ Callback Hell.
 (define-public python-aiohttp-socks
   (package
     (name "python-aiohttp-socks")
-    (version "0.2.2")
+    (version "0.5.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "aiohttp_socks" version))
        (sha256
         (base32
-         "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"))))
+         "0jmhb0l1w8k1nishij3awd9zv8zbyb5l35a2pdalrqxxasbhbcif"))))
     (build-system python-build-system)
     (propagated-inputs
-     `(("python-aiohttp" ,python-aiohttp)))
+     `(("python-aiohttp" ,python-aiohttp)
+       ("python-attrs" ,python-attrs)
+       ("python-socks" ,python-socks)))
     (home-page "https://github.com/romis2012/aiohttp-socks")
     (synopsis "SOCKS proxy connector for aiohttp")
     (description "This package provides a SOCKS proxy connector for
-- 
2.29.2

John Doe wrote on 11 Dec 2020 21:18

[PATCH v2 7/8] gnu: libsecp256k1: Update to 20200615-1-dbd41db.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211201833.22529-7-dftxbs3e@free.fr

* gnu/packages/crypto.scm (libsecp256k1):
[commit]: Set to "dbd41db16a0e91b2566820898a3ab2d7dad4fe00".
[version]: Bump to 20200615-1-dbd41db.
[arguments]: Add "--enable-module-recovery",
"--enable-experimental", "--enable-module-ecdh" and
"--enable-shared" to #:configure-flags.
---
 gnu/packages/crypto.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Toggle diff (35 lines)diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 1b51366d7e..f0fc1ec5a3 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1028,10 +1028,10 @@ trivial to build for local use.  Portability is emphasized over performance.")
     (license license:unlicense)))
 
 (define-public libsecp256k1
-  (let ((commit "d644dda5c9dbdecee52d1aa259235510fdc2d4ee"))
+  (let ((commit "dbd41db16a0e91b2566820898a3ab2d7dad4fe00"))
     (package
       (name "libsecp256k1")
-      (version (git-version "20191213" "1" commit))
+      (version (git-version "20200615" "1" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1039,9 +1039,14 @@ trivial to build for local use.  Portability is emphasized over performance.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0zmx32746khsm2cx0p3pdy3j2vkwmafvf7axiixijhgcg0xjv93i"))
+                  "1fcpnksq5cqwqzshn5f0lq94b73p3frwbp04hgmmbnrndpqg6mpy"))
                 (file-name (git-file-name name version))))
       (build-system gnu-build-system)
+      (arguments
+	'(#:configure-flags '("--enable-module-recovery"
+			      "--enable-experimental"
+			      "--enable-module-ecdh"
+			      "--enable-shared")))
       (native-inputs
        `(("autoconf" ,autoconf)
          ("automake" ,automake)
-- 
2.29.2

John Doe wrote on 11 Dec 2020 21:18

[PATCH v2 8/8] gnu: electrum: Update to 4.0.7.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211201833.22529-8-dftxbs3e@free.fr

* gnu/packages/finance.scm (electrum): Update to 4.0.7.
[inputs]: Remove python-pyaes, python-pysocks, python-sip,
python-pbkdf2, python-requests, python-jsonrpclib-pelix and
python-ecdsa. Add python-bitstring, python-attrs, python-cryptography,
python-qdarkstyle and libsecp256k1.
[arguments]: Copy 'use-libsecp256k1-input phase from
(electron-cash) to #:phases to fix runtime lookup of libsecp256k1
library.
---
 gnu/packages/finance.scm | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

Toggle diff (68 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 579e060d26..968ef70914 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -495,7 +495,7 @@ do so.")
 (define-public electrum
   (package
     (name "electrum")
-    (version "3.3.8")
+    (version "4.0.7")
     (source
      (origin
        (method url-fetch)
@@ -503,7 +503,7 @@ do so.")
                            version "/Electrum-"
                            version ".tar.gz"))
        (sha256
-        (base32 "1g00cj1pmckd4xis8r032wmraiv3vd3zc803hnyxa2bnhj8z3bg2"))
+        (base32 "0k5xf97ga3ixd02g1y6v84hbxd8yhvpj5iz2rhxs8wfnkfwibzh4"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -512,21 +512,19 @@ do so.")
            #t))))
     (build-system python-build-system)
     (inputs
-     `(("python-pyaes" ,python-pyaes)
-       ("python-pysocks" ,python-pysocks)
-       ("python-sip" ,python-sip)
-       ("python-pyqt" ,python-pyqt)
-       ("python-ecdsa" ,python-ecdsa)
-       ("python-pbkdf2" ,python-pbkdf2)
-       ("python-requests" ,python-requests)
+     `(("python-pyqt" ,python-pyqt)
        ("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-bitstring" ,python-bitstring)
+       ("python-attrs" ,python-attrs)
+       ("python-cryptography" ,python-cryptography)
+       ("python-qdarkstyle" ,python-qdarkstyle)
        ("python-dnspython" ,python-dnspython)
-       ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
+       ("libsecp256k1" ,libsecp256k1)))
     (arguments
      `(#:tests? #f                      ; no tests
        #:phases
@@ -540,7 +538,14 @@ do so.")
                (substitute* "setup.py"
                  (("sys\\.prefix")
                   (format #f "\"~a\"" out)))
-               #t))))))
+               #t)))
+         (add-after 'unpack 'use-libsecp256k1-input
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "electrum/ecc_fast.py"
+               (("library_paths = .* 'libsecp256k1.so.0'.")
+                (string-append "library_paths = ('"
+                               (assoc-ref inputs "libsecp256k1")
+                               "/lib/libsecp256k1.so.0'"))))))))
     (home-page "https://electrum.org/")
     (synopsis "Bitcoin wallet")
     (description
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 20:53

[PATCH v2 1/8] gnu: Add python-qtpy.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211195331.21451-1-lle-bout@zaclys.net

* gnu/packages/python-xyz.scm (python-qtpy): New variable.

---

gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (35 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d312e3172a..a92898c7f0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23222,3 +23222,28 @@ process.")
      "Gamera is a toolkit for building document image recognition systems.")
     (home-page "https://gamera.informatik.hsnr.de/")
     (license license:gpl2+)))
+
+(define-public python-qtpy
+  (package
+    (name "python-qtpy")
+    (version "1.9.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "QtPy" version))
+        (sha256
+          (base32
+            "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-pyside2" ,python-pyside-2)))
+    (arguments
+      `(;; Not all supported bindings are packaged. Especially PyQt4.
+	#:tests? #f))
+    (home-page "https://github.com/spyder-ide/qtpy")
+    (synopsis
+     "Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets")
+    (description
+     "Provides an abstraction layer on top of the various Qt bindings
+(PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
+    (license license:expat)))
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 20:53

[PATCH v2 2/8] gnu: Add python-helpdev.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211195331.21451-2-lle-bout@zaclys.net

* gnu/packages/python-xyz.scm (python-helpdev): New variable.

---

gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++

1 file changed, 23 insertions(+)

Toggle diff (33 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a92898c7f0..c3e55f5aff 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23247,3 +23247,26 @@ process.")
      "Provides an abstraction layer on top of the various Qt bindings
 (PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
     (license license:expat)))
+
+(define-public python-helpdev
+  (package
+    (name "python-helpdev")
+    (version "0.7.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "helpdev" version))
+        (sha256
+          (base32
+            "0gfvj28i82va7c264jl2p4cdsl3lpf9fpb9cyjnis55crfdafqmv"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-importlib-metadata"
+         ,python-importlib-metadata)))
+    (home-page "https://gitlab.com/dpizetta/helpdev")
+    (synopsis
+      "Extracts information about the Python environment easily")
+    (description
+      "Helpdev is a library to easily extract information about the Python
+environment.")
+    (license license:expat)))
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 20:53

[PATCH v2 3/8] gnu: Add python-qdarkstyle.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211195331.21451-3-lle-bout@zaclys.net

* gnu/packages/python-xyz.scm (python-qdarkstyle): New variable.

---

gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c3e55f5aff..c3591f53b4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23270,3 +23270,30 @@ process.")
       "Helpdev is a library to easily extract information about the Python
 environment.")
     (license license:expat)))
+
+(define-public python-qdarkstyle
+  (package
+    (name "python-qdarkstyle")
+    (version "2.8.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "QDarkStyle" version))
+        (sha256
+          (base32
+            "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym"))))
+    (build-system python-build-system)
+    (arguments
+      `(;; Fails unable to detect valid Qt bindings even if you
+	;; add them as native-inputs.
+	#:tests? #f))
+    (propagated-inputs
+      `(("python-helpdev" ,python-helpdev)
+        ("python-qtpy" ,python-qtpy)))
+    (home-page
+      "https://github.com/ColinDuquesnoy/QDarkStyleSheet")
+    (synopsis
+      "Complete dark stylesheet for Python and Qt applications")
+    (description
+      "QDarkStyle is the most complete dark stylesheet for Python and Qt applications.")
+    (license license:expat)))
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 20:53

[PATCH v2 4/8] gnu: Add python-bitstring.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211195331.21451-4-lle-bout@zaclys.net

* gnu/packages/python-xyz.scm (python-bitstring): New variable.

---

gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++

1 file changed, 21 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c3591f53b4..4f55ed2e83 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23297,3 +23297,24 @@ environment.")
     (description
       "QDarkStyle is the most complete dark stylesheet for Python and Qt applications.")
     (license license:expat)))
+
+(define-public python-bitstring
+  (package
+    (name "python-bitstring")
+    (version "3.1.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "bitstring" version))
+        (sha256
+          (base32
+            "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx"))))
+    (build-system python-build-system)
+    (home-page
+      "https://github.com/scott-griffiths/bitstring")
+    (synopsis
+      "Simple construction, analysis and modification of binary data")
+    (description
+      "Bitstring is a library for simple construction, analysis and modification
+ of binary data.")
+    (license license:expat)))
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 20:53

[PATCH v2 5/8] gnu: Add python-socks.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211195331.21451-5-lle-bout@zaclys.net

* gnu/packages/python-xyz.scm (python-socks): New variable.

---

gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4f55ed2e83..426c2b853d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23318,3 +23318,30 @@ environment.")
       "Bitstring is a library for simple construction, analysis and modification
  of binary data.")
     (license license:expat)))
+
+(define-public python-socks
+  (package
+    (name "python-socks")
+    (version "1.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "python-socks" version))
+        (sha256
+          (base32
+            "1y9sp0hijywjrqwpjgpq3yjmfm6s0rj1br19xm77ffk72w5pdr26"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      ;; For python-socks[asyncio]
+      `(("python-async-timeout" ,python-async-timeout)))
+    (native-inputs
+      `(("python-trio" ,python-trio)
+	("python-curio" ,python-curio)))
+    (home-page
+      "https://github.com/romis2012/python-socks")
+    (synopsis
+      "Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python")
+    (description
+      "Socks is a library providing core proxy (SOCKS4, SOCKS5, HTTP tunneling)
+ functionality.")
+    (license license:asl2.0)))
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 20:53

[PATCH v2 6/8] gnu: python-aiohttp-socks: Update to 0.5.5.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211195331.21451-6-lle-bout@zaclys.net

* gnu/packages/python-web.scm (python-aiohttp-socks):

[version]: Bump to 0.5.5.

[propagated-inputs]: Add python-socks, python-attrs.

---

gnu/packages/python-web.scm | 8 +++++---

1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (29 lines)diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 107f579ad6..797d94f12a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -166,17 +166,19 @@ Callback Hell.
 (define-public python-aiohttp-socks
   (package
     (name "python-aiohttp-socks")
-    (version "0.2.2")
+    (version "0.5.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "aiohttp_socks" version))
        (sha256
         (base32
-         "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"))))
+         "0jmhb0l1w8k1nishij3awd9zv8zbyb5l35a2pdalrqxxasbhbcif"))))
     (build-system python-build-system)
     (propagated-inputs
-     `(("python-aiohttp" ,python-aiohttp)))
+     `(("python-aiohttp" ,python-aiohttp)
+       ("python-attrs" ,python-attrs)
+       ("python-socks" ,python-socks)))
     (home-page "https://github.com/romis2012/aiohttp-socks")
     (synopsis "SOCKS proxy connector for aiohttp")
     (description "This package provides a SOCKS proxy connector for
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 20:53

[PATCH v2 7/8] gnu: libsecp256k1: Update to 20200615-1-dbd41db.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211195331.21451-7-lle-bout@zaclys.net

From: John Doe <dftxbs3e@free.fr>

* gnu/packages/crypto.scm (libsecp256k1):
[commit]: Set to "dbd41db16a0e91b2566820898a3ab2d7dad4fe00".
[version]: Bump to 20200615-1-dbd41db.
[arguments]: Add "--enable-module-recovery",
"--enable-experimental", "--enable-module-ecdh" and
"--enable-shared" to #:configure-flags.
---
 gnu/packages/crypto.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Toggle diff (35 lines)diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 1b51366d7e..f0fc1ec5a3 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1028,10 +1028,10 @@ trivial to build for local use.  Portability is emphasized over performance.")
     (license license:unlicense)))
 
 (define-public libsecp256k1
-  (let ((commit "d644dda5c9dbdecee52d1aa259235510fdc2d4ee"))
+  (let ((commit "dbd41db16a0e91b2566820898a3ab2d7dad4fe00"))
     (package
       (name "libsecp256k1")
-      (version (git-version "20191213" "1" commit))
+      (version (git-version "20200615" "1" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1039,9 +1039,14 @@ trivial to build for local use.  Portability is emphasized over performance.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0zmx32746khsm2cx0p3pdy3j2vkwmafvf7axiixijhgcg0xjv93i"))
+                  "1fcpnksq5cqwqzshn5f0lq94b73p3frwbp04hgmmbnrndpqg6mpy"))
                 (file-name (git-file-name name version))))
       (build-system gnu-build-system)
+      (arguments
+	'(#:configure-flags '("--enable-module-recovery"
+			      "--enable-experimental"
+			      "--enable-module-ecdh"
+			      "--enable-shared")))
       (native-inputs
        `(("autoconf" ,autoconf)
          ("automake" ,automake)
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 20:53

[PATCH v2 8/8] gnu: electrum: Update to 4.0.7.

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211195331.21451-8-lle-bout@zaclys.net

From: John Doe <dftxbs3e@free.fr>

* gnu/packages/finance.scm (electrum): Update to 4.0.7.
[inputs]: Remove python-pyaes, python-pysocks, python-sip,
python-pbkdf2, python-requests, python-jsonrpclib-pelix and
python-ecdsa. Add python-bitstring, python-attrs, python-cryptography,
python-qdarkstyle and libsecp256k1.
[arguments]: Copy 'use-libsecp256k1-input phase from
(electron-cash) to #:phases to fix runtime lookup of libsecp256k1
library.
---
 gnu/packages/finance.scm | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

Toggle diff (68 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 579e060d26..968ef70914 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -495,7 +495,7 @@ do so.")
 (define-public electrum
   (package
     (name "electrum")
-    (version "3.3.8")
+    (version "4.0.7")
     (source
      (origin
        (method url-fetch)
@@ -503,7 +503,7 @@ do so.")
                            version "/Electrum-"
                            version ".tar.gz"))
        (sha256
-        (base32 "1g00cj1pmckd4xis8r032wmraiv3vd3zc803hnyxa2bnhj8z3bg2"))
+        (base32 "0k5xf97ga3ixd02g1y6v84hbxd8yhvpj5iz2rhxs8wfnkfwibzh4"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -512,21 +512,19 @@ do so.")
            #t))))
     (build-system python-build-system)
     (inputs
-     `(("python-pyaes" ,python-pyaes)
-       ("python-pysocks" ,python-pysocks)
-       ("python-sip" ,python-sip)
-       ("python-pyqt" ,python-pyqt)
-       ("python-ecdsa" ,python-ecdsa)
-       ("python-pbkdf2" ,python-pbkdf2)
-       ("python-requests" ,python-requests)
+     `(("python-pyqt" ,python-pyqt)
        ("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-bitstring" ,python-bitstring)
+       ("python-attrs" ,python-attrs)
+       ("python-cryptography" ,python-cryptography)
+       ("python-qdarkstyle" ,python-qdarkstyle)
        ("python-dnspython" ,python-dnspython)
-       ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
+       ("libsecp256k1" ,libsecp256k1)))
     (arguments
      `(#:tests? #f                      ; no tests
        #:phases
@@ -540,7 +538,14 @@ do so.")
                (substitute* "setup.py"
                  (("sys\\.prefix")
                   (format #f "\"~a\"" out)))
-               #t))))))
+               #t)))
+         (add-after 'unpack 'use-libsecp256k1-input
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "electrum/ecc_fast.py"
+               (("library_paths = .* 'libsecp256k1.so.0'.")
+                (string-append "library_paths = ('"
+                               (assoc-ref inputs "libsecp256k1")
+                               "/lib/libsecp256k1.so.0'"))))))))
     (home-page "https://electrum.org/")
     (synopsis "Bitcoin wallet")
     (description
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 20:55

Recipients:(address . 44990@debbugs.gnu.org)(name . John Doe)(address . dftxbs3e@free.fr)

Message-ID:20201211195552.21624-8-lle-bout@zaclys.net

From: John Doe <dftxbs3e@free.fr>

* gnu/packages/finance.scm (electrum): Update to 4.0.7.
[inputs]: Remove python-pyaes, python-pysocks, python-sip,
python-pbkdf2, python-requests, python-jsonrpclib-pelix and
python-ecdsa. Add python-bitstring, python-attrs, python-cryptography,
python-qdarkstyle and libsecp256k1.
[arguments]: Copy 'use-libsecp256k1-input phase from
(electron-cash) to #:phases to fix runtime lookup of libsecp256k1
library.
---
 gnu/packages/finance.scm | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

Toggle diff (68 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 579e060d26..968ef70914 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -495,7 +495,7 @@ do so.")
 (define-public electrum
   (package
     (name "electrum")
-    (version "3.3.8")
+    (version "4.0.7")
     (source
      (origin
        (method url-fetch)
@@ -503,7 +503,7 @@ do so.")
                            version "/Electrum-"
                            version ".tar.gz"))
        (sha256
-        (base32 "1g00cj1pmckd4xis8r032wmraiv3vd3zc803hnyxa2bnhj8z3bg2"))
+        (base32 "0k5xf97ga3ixd02g1y6v84hbxd8yhvpj5iz2rhxs8wfnkfwibzh4"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -512,21 +512,19 @@ do so.")
            #t))))
     (build-system python-build-system)
     (inputs
-     `(("python-pyaes" ,python-pyaes)
-       ("python-pysocks" ,python-pysocks)
-       ("python-sip" ,python-sip)
-       ("python-pyqt" ,python-pyqt)
-       ("python-ecdsa" ,python-ecdsa)
-       ("python-pbkdf2" ,python-pbkdf2)
-       ("python-requests" ,python-requests)
+     `(("python-pyqt" ,python-pyqt)
        ("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-bitstring" ,python-bitstring)
+       ("python-attrs" ,python-attrs)
+       ("python-cryptography" ,python-cryptography)
+       ("python-qdarkstyle" ,python-qdarkstyle)
        ("python-dnspython" ,python-dnspython)
-       ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
+       ("libsecp256k1" ,libsecp256k1)))
     (arguments
      `(#:tests? #f                      ; no tests
        #:phases
@@ -540,7 +538,14 @@ do so.")
                (substitute* "setup.py"
                  (("sys\\.prefix")
                   (format #f "\"~a\"" out)))
-               #t))))))
+               #t)))
+         (add-after 'unpack 'use-libsecp256k1-input
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "electrum/ecc_fast.py"
+               (("library_paths = .* 'libsecp256k1.so.0'.")
+                (string-append "library_paths = ('"
+                               (assoc-ref inputs "libsecp256k1")
+                               "/lib/libsecp256k1.so.0'"))))))))
     (home-page "https://electrum.org/")
     (synopsis "Bitcoin wallet")
     (description
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 21:00

[PATCH v2 2/8] gnu: Add python-helpdev.

Recipients:(address . 44990@debbugs.gnu.org)

Message-ID:20201211200105.21995-2-lle-bout@zaclys.net

* gnu/packages/python-xyz.scm (python-helpdev): New variable.

---

gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++

1 file changed, 23 insertions(+)

Toggle diff (33 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index a92898c7f0..c3e55f5aff 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23247,3 +23247,26 @@ process.")
      "Provides an abstraction layer on top of the various Qt bindings
 (PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
     (license license:expat)))
+
+(define-public python-helpdev
+  (package
+    (name "python-helpdev")
+    (version "0.7.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "helpdev" version))
+        (sha256
+          (base32
+            "0gfvj28i82va7c264jl2p4cdsl3lpf9fpb9cyjnis55crfdafqmv"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-importlib-metadata"
+         ,python-importlib-metadata)))
+    (home-page "https://gitlab.com/dpizetta/helpdev")
+    (synopsis
+      "Extracts information about the Python environment easily")
+    (description
+      "Helpdev is a library to easily extract information about the Python
+environment.")
+    (license license:expat)))
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 21:00

[PATCH v2 1/8] gnu: Add python-qtpy.

Recipients:(address . 44990@debbugs.gnu.org)

Message-ID:20201211200105.21995-1-lle-bout@zaclys.net

* gnu/packages/python-xyz.scm (python-qtpy): New variable.

---

gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (35 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index d312e3172a..a92898c7f0 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23222,3 +23222,28 @@ process.")
      "Gamera is a toolkit for building document image recognition systems.")
     (home-page "https://gamera.informatik.hsnr.de/")
     (license license:gpl2+)))
+
+(define-public python-qtpy
+  (package
+    (name "python-qtpy")
+    (version "1.9.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "QtPy" version))
+        (sha256
+          (base32
+            "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-pyside2" ,python-pyside-2)))
+    (arguments
+      `(;; Not all supported bindings are packaged. Especially PyQt4.
+	#:tests? #f))
+    (home-page "https://github.com/spyder-ide/qtpy")
+    (synopsis
+     "Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets")
+    (description
+     "Provides an abstraction layer on top of the various Qt bindings
+(PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
+    (license license:expat)))
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 21:01

[PATCH v2 3/8] gnu: Add python-qdarkstyle.

Recipients:(address . 44990@debbugs.gnu.org)

Message-ID:20201211200105.21995-3-lle-bout@zaclys.net

* gnu/packages/python-xyz.scm (python-qdarkstyle): New variable.

---

gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c3e55f5aff..c3591f53b4 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23270,3 +23270,30 @@ process.")
       "Helpdev is a library to easily extract information about the Python
 environment.")
     (license license:expat)))
+
+(define-public python-qdarkstyle
+  (package
+    (name "python-qdarkstyle")
+    (version "2.8.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "QDarkStyle" version))
+        (sha256
+          (base32
+            "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym"))))
+    (build-system python-build-system)
+    (arguments
+      `(;; Fails unable to detect valid Qt bindings even if you
+	;; add them as native-inputs.
+	#:tests? #f))
+    (propagated-inputs
+      `(("python-helpdev" ,python-helpdev)
+        ("python-qtpy" ,python-qtpy)))
+    (home-page
+      "https://github.com/ColinDuquesnoy/QDarkStyleSheet")
+    (synopsis
+      "Complete dark stylesheet for Python and Qt applications")
+    (description
+      "QDarkStyle is the most complete dark stylesheet for Python and Qt applications.")
+    (license license:expat)))
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 21:01

[PATCH v2 4/8] gnu: Add python-bitstring.

Recipients:(address . 44990@debbugs.gnu.org)

Message-ID:20201211200105.21995-4-lle-bout@zaclys.net

* gnu/packages/python-xyz.scm (python-bitstring): New variable.

---

gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++

1 file changed, 21 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index c3591f53b4..4f55ed2e83 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23297,3 +23297,24 @@ environment.")
     (description
       "QDarkStyle is the most complete dark stylesheet for Python and Qt applications.")
     (license license:expat)))
+
+(define-public python-bitstring
+  (package
+    (name "python-bitstring")
+    (version "3.1.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "bitstring" version))
+        (sha256
+          (base32
+            "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx"))))
+    (build-system python-build-system)
+    (home-page
+      "https://github.com/scott-griffiths/bitstring")
+    (synopsis
+      "Simple construction, analysis and modification of binary data")
+    (description
+      "Bitstring is a library for simple construction, analysis and modification
+ of binary data.")
+    (license license:expat)))
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 21:01

[PATCH v2 5/8] gnu: Add python-socks.

Recipients:(address . 44990@debbugs.gnu.org)

Message-ID:20201211200105.21995-5-lle-bout@zaclys.net

* gnu/packages/python-xyz.scm (python-socks): New variable.

---

gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 4f55ed2e83..426c2b853d 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23318,3 +23318,30 @@ environment.")
       "Bitstring is a library for simple construction, analysis and modification
  of binary data.")
     (license license:expat)))
+
+(define-public python-socks
+  (package
+    (name "python-socks")
+    (version "1.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "python-socks" version))
+        (sha256
+          (base32
+            "1y9sp0hijywjrqwpjgpq3yjmfm6s0rj1br19xm77ffk72w5pdr26"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      ;; For python-socks[asyncio]
+      `(("python-async-timeout" ,python-async-timeout)))
+    (native-inputs
+      `(("python-trio" ,python-trio)
+	("python-curio" ,python-curio)))
+    (home-page
+      "https://github.com/romis2012/python-socks")
+    (synopsis
+      "Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python")
+    (description
+      "Socks is a library providing core proxy (SOCKS4, SOCKS5, HTTP tunneling)
+ functionality.")
+    (license license:asl2.0)))
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 21:01

[PATCH v2 6/8] gnu: python-aiohttp-socks: Update to 0.5.5.

Recipients:(address . 44990@debbugs.gnu.org)

Message-ID:20201211200105.21995-6-lle-bout@zaclys.net

* gnu/packages/python-web.scm (python-aiohttp-socks):

[version]: Bump to 0.5.5.

[propagated-inputs]: Add python-socks, python-attrs.

---

gnu/packages/python-web.scm | 8 +++++---

1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (29 lines)diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 107f579ad6..797d94f12a 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -166,17 +166,19 @@ Callback Hell.
 (define-public python-aiohttp-socks
   (package
     (name "python-aiohttp-socks")
-    (version "0.2.2")
+    (version "0.5.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "aiohttp_socks" version))
        (sha256
         (base32
-         "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"))))
+         "0jmhb0l1w8k1nishij3awd9zv8zbyb5l35a2pdalrqxxasbhbcif"))))
     (build-system python-build-system)
     (propagated-inputs
-     `(("python-aiohttp" ,python-aiohttp)))
+     `(("python-aiohttp" ,python-aiohttp)
+       ("python-attrs" ,python-attrs)
+       ("python-socks" ,python-socks)))
     (home-page "https://github.com/romis2012/aiohttp-socks")
     (synopsis "SOCKS proxy connector for aiohttp")
     (description "This package provides a SOCKS proxy connector for
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 21:01

[PATCH v2 7/8] gnu: libsecp256k1: Update to 20200615-1-dbd41db.

Recipients:(address . 44990@debbugs.gnu.org)

Message-ID:20201211200105.21995-7-lle-bout@zaclys.net

From: John Doe <dftxbs3e@free.fr>

* gnu/packages/crypto.scm (libsecp256k1):
[commit]: Set to "dbd41db16a0e91b2566820898a3ab2d7dad4fe00".
[version]: Bump to 20200615-1-dbd41db.
[arguments]: Add "--enable-module-recovery",
"--enable-experimental", "--enable-module-ecdh" and
"--enable-shared" to #:configure-flags.
---
 gnu/packages/crypto.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Toggle diff (35 lines)diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 1b51366d7e..f0fc1ec5a3 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1028,10 +1028,10 @@ trivial to build for local use.  Portability is emphasized over performance.")
     (license license:unlicense)))
 
 (define-public libsecp256k1
-  (let ((commit "d644dda5c9dbdecee52d1aa259235510fdc2d4ee"))
+  (let ((commit "dbd41db16a0e91b2566820898a3ab2d7dad4fe00"))
     (package
       (name "libsecp256k1")
-      (version (git-version "20191213" "1" commit))
+      (version (git-version "20200615" "1" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1039,9 +1039,14 @@ trivial to build for local use.  Portability is emphasized over performance.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0zmx32746khsm2cx0p3pdy3j2vkwmafvf7axiixijhgcg0xjv93i"))
+                  "1fcpnksq5cqwqzshn5f0lq94b73p3frwbp04hgmmbnrndpqg6mpy"))
                 (file-name (git-file-name name version))))
       (build-system gnu-build-system)
+      (arguments
+	'(#:configure-flags '("--enable-module-recovery"
+			      "--enable-experimental"
+			      "--enable-module-ecdh"
+			      "--enable-shared")))
       (native-inputs
        `(("autoconf" ,autoconf)
          ("automake" ,automake)
-- 
2.29.2

Léo Le Bouter wrote on 11 Dec 2020 21:01

[PATCH v2 8/8] gnu: electrum: Update to 4.0.7.

Recipients:(address . 44990@debbugs.gnu.org)

Message-ID:20201211200105.21995-8-lle-bout@zaclys.net

From: John Doe <dftxbs3e@free.fr>

* gnu/packages/finance.scm (electrum): Update to 4.0.7.
[inputs]: Remove python-pyaes, python-pysocks, python-sip,
python-pbkdf2, python-requests, python-jsonrpclib-pelix and
python-ecdsa. Add python-bitstring, python-attrs, python-cryptography,
python-qdarkstyle and libsecp256k1.
[arguments]: Copy 'use-libsecp256k1-input phase from
(electron-cash) to #:phases to fix runtime lookup of libsecp256k1
library.
---
 gnu/packages/finance.scm | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

Toggle diff (68 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 579e060d26..968ef70914 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -495,7 +495,7 @@ do so.")
 (define-public electrum
   (package
     (name "electrum")
-    (version "3.3.8")
+    (version "4.0.7")
     (source
      (origin
        (method url-fetch)
@@ -503,7 +503,7 @@ do so.")
                            version "/Electrum-"
                            version ".tar.gz"))
        (sha256
-        (base32 "1g00cj1pmckd4xis8r032wmraiv3vd3zc803hnyxa2bnhj8z3bg2"))
+        (base32 "0k5xf97ga3ixd02g1y6v84hbxd8yhvpj5iz2rhxs8wfnkfwibzh4"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -512,21 +512,19 @@ do so.")
            #t))))
     (build-system python-build-system)
     (inputs
-     `(("python-pyaes" ,python-pyaes)
-       ("python-pysocks" ,python-pysocks)
-       ("python-sip" ,python-sip)
-       ("python-pyqt" ,python-pyqt)
-       ("python-ecdsa" ,python-ecdsa)
-       ("python-pbkdf2" ,python-pbkdf2)
-       ("python-requests" ,python-requests)
+     `(("python-pyqt" ,python-pyqt)
        ("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-bitstring" ,python-bitstring)
+       ("python-attrs" ,python-attrs)
+       ("python-cryptography" ,python-cryptography)
+       ("python-qdarkstyle" ,python-qdarkstyle)
        ("python-dnspython" ,python-dnspython)
-       ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
+       ("libsecp256k1" ,libsecp256k1)))
     (arguments
      `(#:tests? #f                      ; no tests
        #:phases
@@ -540,7 +538,14 @@ do so.")
                (substitute* "setup.py"
                  (("sys\\.prefix")
                   (format #f "\"~a\"" out)))
-               #t))))))
+               #t)))
+         (add-after 'unpack 'use-libsecp256k1-input
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "electrum/ecc_fast.py"
+               (("library_paths = .* 'libsecp256k1.so.0'.")
+                (string-append "library_paths = ('"
+                               (assoc-ref inputs "libsecp256k1")
+                               "/lib/libsecp256k1.so.0'"))))))))
     (home-page "https://electrum.org/")
     (synopsis "Bitcoin wallet")
     (description
-- 
2.29.2

Efraim Flashner wrote on 21 Dec 2020 09:18

Re: [bug#44990] [PATCH v2 1/8] gnu: Add python-qtpy.

Recipients:(name . John Doe)(address . dftxbs3e@free.fr)(address . 44990@debbugs.gnu.org)

Message-ID:X+BaRdAmKPQQKTIi@E5400

On Fri, Dec 11, 2020 at 09:18:26PM +0100, John Doe wrote:

Toggle quote (5 lines)

> * gnu/packages/python-xyz.scm (python-qtpy): New variable.

> ---

> gnu/packages/python-xyz.scm | 25 +++++++++++++++++++++++++

> 1 file changed, 25 insertions(+)

I would put this in gnu/packages/qt actually

Toggle quote (38 lines)> 
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
> index d312e3172a..a92898c7f0 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -23222,3 +23222,28 @@ process.")
>       "Gamera is a toolkit for building document image recognition systems.")
>      (home-page "https://gamera.informatik.hsnr.de/")
>      (license license:gpl2+)))
> +
> +(define-public python-qtpy
> +  (package
> +    (name "python-qtpy")
> +    (version "1.9.0")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (pypi-uri "QtPy" version))
> +        (sha256
> +          (base32
> +            "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"))))
> +    (build-system python-build-system)
> +    (propagated-inputs
> +      `(("python-pyside2" ,python-pyside-2)))
> +    (arguments
> +      `(;; Not all supported bindings are packaged. Especially PyQt4.
> +	#:tests? #f))
> +    (home-page "https://github.com/spyder-ide/qtpy")
> +    (synopsis
> +     "Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets")
> +    (description
> +     "Provides an abstraction layer on top of the various Qt bindings
> +(PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
> +    (license license:expat)))
> -- 
> 2.29.2
> 

I tried a bit to get the tests working. It looks like python-pyside-2
should propagate python-shiboken, and I forgot about
python-pyqtwebengine, which looks like it's necessary to run the tests.
I haven't looked at the other patches yet, but I wonder how useful this
package is with just python-pyside-2 as an input.

-- 
Efraim Flashner   <efraim@flashner.co.il>   ????? ?????
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

John Doe wrote on 27 Dec 2020 23:13

[PATCH v3 0/8] gnu: electrum: Update to 4.0.9.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227221333.23351-1-dftxbs3e@free.fr

Rebased on master, updated to 4.0.9 electrum release and moved
python-qtpy to gnu/packages/qt.scm as requested!

I suggest we merge this and later patch the newly added packages so that
the electrum update is available. Nothing else but electrum uses these
packages for now, and electrum works.

John Doe (8):
  gnu: Add python-qtpy.
  gnu: Add python-helpdev.
  gnu: Add python-qdarkstyle.
  gnu: Add python-bitstring.
  gnu: Add python-socks.
  gnu: python-aiohttp-socks: Update to 0.5.5.
  gnu: libsecp256k1: Update to 20200615-1-dbd41db.
  gnu: electrum: Update to 4.0.9.

 gnu/packages/crypto.scm     | 11 +++--
 gnu/packages/finance.scm    | 27 +++++-----
 gnu/packages/python-web.scm |  8 +--
 gnu/packages/python-xyz.scm | 98 +++++++++++++++++++++++++++++++++++++
 gnu/packages/qt.scm         | 25 ++++++++++
 5 files changed, 152 insertions(+), 17 deletions(-)

-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:13

[PATCH v3 1/8] gnu: Add python-qtpy.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227221333.23351-2-dftxbs3e@free.fr

* gnu/packages/qt.scm (python-qtpy): New variable.

---

gnu/packages/qt.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (38 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 2e621e758c..9a5b329f4d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2268,6 +2268,31 @@ itself.")
                        "--sipdir" sip)))))))
     (license (list license:gpl2 license:gpl3)))) ; choice of either license
 
+(define-public python-qtpy
+  (package
+    (name "python-qtpy")
+    (version "1.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "QtPy" version))
+       (sha256
+          (base32
+           "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-pyside2" ,python-pyside-2)))
+    (arguments
+     `(;; Not all supported bindings are packaged. Especially PyQt4.
+       #:tests? #f))
+    (home-page "https://github.com/spyder-ide/qtpy")
+    (synopsis
+     "Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets")
+    (description
+     "Provides an abstraction layer on top of the various Qt bindings
+(PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
+    (license license:expat)))
+
 (define-public qscintilla
   (package
     (name "qscintilla")
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:13

[PATCH v3 2/8] gnu: Add python-helpdev.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227221333.23351-3-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-helpdev): New variable.

---

gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++

1 file changed, 23 insertions(+)

Toggle diff (33 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index acde5a5e5e..47edaabc0c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23201,3 +23201,26 @@ backport of the @code{dataclasses} module for Python 3.6.")
     (description "@code{python-pywatchman} is a library to connect and
 query Watchman to discover file changes.")
     (license license:bsd-3)))
+
+(define-public python-helpdev
+  (package
+    (name "python-helpdev")
+    (version "0.7.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "helpdev" version))
+        (sha256
+          (base32
+            "0gfvj28i82va7c264jl2p4cdsl3lpf9fpb9cyjnis55crfdafqmv"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-importlib-metadata"
+         ,python-importlib-metadata)))
+    (home-page "https://gitlab.com/dpizetta/helpdev")
+    (synopsis
+      "Extracts information about the Python environment easily")
+    (description
+      "Helpdev is a library to easily extract information about the Python
+environment.")
+    (license license:expat)))
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:13

[PATCH v3 3/8] gnu: Add python-qdarkstyle.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227221333.23351-4-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-qdarkstyle): New variable.

---

gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 47edaabc0c..2df26dffbf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23224,3 +23224,30 @@ query Watchman to discover file changes.")
       "Helpdev is a library to easily extract information about the Python
 environment.")
     (license license:expat)))
+
+(define-public python-qdarkstyle
+  (package
+    (name "python-qdarkstyle")
+    (version "2.8.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "QDarkStyle" version))
+        (sha256
+          (base32
+            "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym"))))
+    (build-system python-build-system)
+    (arguments
+      `(;; Fails unable to detect valid Qt bindings even if you
+	;; add them as native-inputs.
+	#:tests? #f))
+    (propagated-inputs
+      `(("python-helpdev" ,python-helpdev)
+        ("python-qtpy" ,python-qtpy)))
+    (home-page
+      "https://github.com/ColinDuquesnoy/QDarkStyleSheet")
+    (synopsis
+      "Complete dark stylesheet for Python and Qt applications")
+    (description
+      "QDarkStyle is the most complete dark stylesheet for Python and Qt applications.")
+    (license license:expat)))
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:13

[PATCH v3 4/8] gnu: Add python-bitstring.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227221333.23351-5-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-bitstring): New variable.

---

gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++

1 file changed, 21 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2df26dffbf..b06f6011de 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23251,3 +23251,24 @@ environment.")
     (description
       "QDarkStyle is the most complete dark stylesheet for Python and Qt applications.")
     (license license:expat)))
+
+(define-public python-bitstring
+  (package
+    (name "python-bitstring")
+    (version "3.1.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "bitstring" version))
+        (sha256
+          (base32
+            "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx"))))
+    (build-system python-build-system)
+    (home-page
+      "https://github.com/scott-griffiths/bitstring")
+    (synopsis
+      "Simple construction, analysis and modification of binary data")
+    (description
+      "Bitstring is a library for simple construction, analysis and modification
+ of binary data.")
+    (license license:expat)))
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:13

[PATCH v3 5/8] gnu: Add python-socks.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227221333.23351-6-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-socks): New variable.

---

gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b06f6011de..93e0292b28 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23272,3 +23272,30 @@ environment.")
       "Bitstring is a library for simple construction, analysis and modification
  of binary data.")
     (license license:expat)))
+
+(define-public python-socks
+  (package
+    (name "python-socks")
+    (version "1.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "python-socks" version))
+        (sha256
+          (base32
+            "1y9sp0hijywjrqwpjgpq3yjmfm6s0rj1br19xm77ffk72w5pdr26"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      ;; For python-socks[asyncio]
+      `(("python-async-timeout" ,python-async-timeout)))
+    (native-inputs
+      `(("python-trio" ,python-trio)
+	("python-curio" ,python-curio)))
+    (home-page
+      "https://github.com/romis2012/python-socks")
+    (synopsis
+      "Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python")
+    (description
+      "Socks is a library providing core proxy (SOCKS4, SOCKS5, HTTP tunneling)
+ functionality.")
+    (license license:asl2.0)))
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:13

[PATCH v3 6/8] gnu: python-aiohttp-socks: Update to 0.5.5.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227221333.23351-7-dftxbs3e@free.fr

* gnu/packages/python-web.scm (python-aiohttp-socks):
[version]: Bump to 0.5.5.
[propagated-inputs]: Add python-socks, python-attrs.
---
 gnu/packages/python-web.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (29 lines)diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index bdde4d90f4..0f1a6dec44 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -167,17 +167,19 @@ Callback Hell.
 (define-public python-aiohttp-socks
   (package
     (name "python-aiohttp-socks")
-    (version "0.2.2")
+    (version "0.5.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "aiohttp_socks" version))
        (sha256
         (base32
-         "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"))))
+         "0jmhb0l1w8k1nishij3awd9zv8zbyb5l35a2pdalrqxxasbhbcif"))))
     (build-system python-build-system)
     (propagated-inputs
-     `(("python-aiohttp" ,python-aiohttp)))
+     `(("python-aiohttp" ,python-aiohttp)
+       ("python-attrs" ,python-attrs)
+       ("python-socks" ,python-socks)))
     (home-page "https://github.com/romis2012/aiohttp-socks")
     (synopsis "SOCKS proxy connector for aiohttp")
     (description "This package provides a SOCKS proxy connector for
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:13

[PATCH v3 7/8] gnu: libsecp256k1: Update to 20200615-1-dbd41db.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227221333.23351-8-dftxbs3e@free.fr

* gnu/packages/crypto.scm (libsecp256k1):
[commit]: Set to "dbd41db16a0e91b2566820898a3ab2d7dad4fe00".
[version]: Bump to 20200615-1-dbd41db.
[arguments]: Add "--enable-module-recovery",
"--enable-experimental", "--enable-module-ecdh" and
"--enable-shared" to #:configure-flags.
---
 gnu/packages/crypto.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Toggle diff (35 lines)diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 1b51366d7e..f0fc1ec5a3 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1028,10 +1028,10 @@ trivial to build for local use.  Portability is emphasized over performance.")
     (license license:unlicense)))
 
 (define-public libsecp256k1
-  (let ((commit "d644dda5c9dbdecee52d1aa259235510fdc2d4ee"))
+  (let ((commit "dbd41db16a0e91b2566820898a3ab2d7dad4fe00"))
     (package
       (name "libsecp256k1")
-      (version (git-version "20191213" "1" commit))
+      (version (git-version "20200615" "1" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1039,9 +1039,14 @@ trivial to build for local use.  Portability is emphasized over performance.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0zmx32746khsm2cx0p3pdy3j2vkwmafvf7axiixijhgcg0xjv93i"))
+                  "1fcpnksq5cqwqzshn5f0lq94b73p3frwbp04hgmmbnrndpqg6mpy"))
                 (file-name (git-file-name name version))))
       (build-system gnu-build-system)
+      (arguments
+	'(#:configure-flags '("--enable-module-recovery"
+			      "--enable-experimental"
+			      "--enable-module-ecdh"
+			      "--enable-shared")))
       (native-inputs
        `(("autoconf" ,autoconf)
          ("automake" ,automake)
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:13

[PATCH v3 8/8] gnu: electrum: Update to 4.0.9.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227221333.23351-9-dftxbs3e@free.fr

* gnu/packages/finance.scm (electrum): Update to 4.0.9.
[inputs]: Remove python-pyaes, python-pysocks, python-sip,
python-pbkdf2, python-requests, python-jsonrpclib-pelix and
python-ecdsa. Add python-bitstring, python-attrs, python-cryptography,
python-qdarkstyle and libsecp256k1.
[arguments]: Copy 'use-libsecp256k1-input phase from
(electron-cash) to #:phases to fix runtime lookup of libsecp256k1
library.
---
 gnu/packages/finance.scm | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

Toggle diff (68 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index c7a606f3b2..f2c15d930b 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -495,7 +495,7 @@ do so.")
 (define-public electrum
   (package
     (name "electrum")
-    (version "3.3.8")
+    (version "4.0.9")
     (source
      (origin
        (method url-fetch)
@@ -503,7 +503,7 @@ do so.")
                            version "/Electrum-"
                            version ".tar.gz"))
        (sha256
-        (base32 "1g00cj1pmckd4xis8r032wmraiv3vd3zc803hnyxa2bnhj8z3bg2"))
+        (base32 "1fvjiagi78f32nxgr2rx8jas8hxfvpp1c8fpfcalvykmlhdc2gva"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -512,21 +512,19 @@ do so.")
            #t))))
     (build-system python-build-system)
     (inputs
-     `(("python-pyaes" ,python-pyaes)
-       ("python-pysocks" ,python-pysocks)
-       ("python-sip" ,python-sip)
-       ("python-pyqt" ,python-pyqt)
-       ("python-ecdsa" ,python-ecdsa)
-       ("python-pbkdf2" ,python-pbkdf2)
-       ("python-requests" ,python-requests)
+     `(("python-pyqt" ,python-pyqt)
        ("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-bitstring" ,python-bitstring)
+       ("python-attrs" ,python-attrs)
+       ("python-cryptography" ,python-cryptography)
+       ("python-qdarkstyle" ,python-qdarkstyle)
        ("python-dnspython" ,python-dnspython-1.16)
-       ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
+       ("libsecp256k1" ,libsecp256k1)))
     (arguments
      `(#:tests? #f                      ; no tests
        #:phases
@@ -540,7 +538,14 @@ do so.")
                (substitute* "setup.py"
                  (("sys\\.prefix")
                   (format #f "\"~a\"" out)))
-               #t))))))
+               #t)))
+         (add-after 'unpack 'use-libsecp256k1-input
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "electrum/ecc_fast.py"
+               (("library_paths = .* 'libsecp256k1.so.0'.")
+                (string-append "library_paths = ('"
+                               (assoc-ref inputs "libsecp256k1")
+                               "/lib/libsecp256k1.so.0'"))))))))
     (home-page "https://electrum.org/")
     (synopsis "Bitcoin wallet")
     (description
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:26

[PATCH v4 0/8] gnu: electrum: Update to 4.0.9.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227222653.23898-1-dftxbs3e@free.fr

Sorry sending a new revision so fast, missed a mistake.

electrum >=4.0.7 requires python-dnspython >=2

John Doe (8):
  gnu: Add python-qtpy.
  gnu: Add python-helpdev.
  gnu: Add python-qdarkstyle.
  gnu: Add python-bitstring.
  gnu: Add python-socks.
  gnu: python-aiohttp-socks: Update to 0.5.5.
  gnu: libsecp256k1: Update to 20200615-1-dbd41db.
  gnu: electrum: Update to 4.0.9.

 gnu/packages/crypto.scm     | 11 +++--
 gnu/packages/finance.scm    | 29 ++++++-----
 gnu/packages/python-web.scm |  8 +--
 gnu/packages/python-xyz.scm | 98 +++++++++++++++++++++++++++++++++++++
 gnu/packages/qt.scm         | 25 ++++++++++
 5 files changed, 153 insertions(+), 18 deletions(-)

-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:26

[PATCH v4 1/8] gnu: Add python-qtpy.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227222653.23898-2-dftxbs3e@free.fr

* gnu/packages/qt.scm (python-qtpy): New variable.

---

gnu/packages/qt.scm | 25 +++++++++++++++++++++++++

1 file changed, 25 insertions(+)

Toggle diff (38 lines)diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 2e621e758c..9a5b329f4d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2268,6 +2268,31 @@ itself.")
                        "--sipdir" sip)))))))
     (license (list license:gpl2 license:gpl3)))) ; choice of either license
 
+(define-public python-qtpy
+  (package
+    (name "python-qtpy")
+    (version "1.9.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "QtPy" version))
+       (sha256
+          (base32
+           "13cw8l7zrhbdi03k1wl1pg9xdl4ahdfa7yz8gd0f23sxnm22rdrd"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-pyside2" ,python-pyside-2)))
+    (arguments
+     `(;; Not all supported bindings are packaged. Especially PyQt4.
+       #:tests? #f))
+    (home-page "https://github.com/spyder-ide/qtpy")
+    (synopsis
+     "Qt bindings (PyQt5, PyQt4 and PySide) and additional custom QWidgets")
+    (description
+     "Provides an abstraction layer on top of the various Qt bindings
+(PyQt5, PyQt4 and PySide) and additional custom QWidgets.")
+    (license license:expat)))
+
 (define-public qscintilla
   (package
     (name "qscintilla")
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:26

[PATCH v4 2/8] gnu: Add python-helpdev.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227222653.23898-3-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-helpdev): New variable.

---

gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++

1 file changed, 23 insertions(+)

Toggle diff (33 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index acde5a5e5e..47edaabc0c 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23201,3 +23201,26 @@ backport of the @code{dataclasses} module for Python 3.6.")
     (description "@code{python-pywatchman} is a library to connect and
 query Watchman to discover file changes.")
     (license license:bsd-3)))
+
+(define-public python-helpdev
+  (package
+    (name "python-helpdev")
+    (version "0.7.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "helpdev" version))
+        (sha256
+          (base32
+            "0gfvj28i82va7c264jl2p4cdsl3lpf9fpb9cyjnis55crfdafqmv"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      `(("python-importlib-metadata"
+         ,python-importlib-metadata)))
+    (home-page "https://gitlab.com/dpizetta/helpdev")
+    (synopsis
+      "Extracts information about the Python environment easily")
+    (description
+      "Helpdev is a library to easily extract information about the Python
+environment.")
+    (license license:expat)))
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:26

[PATCH v4 3/8] gnu: Add python-qdarkstyle.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227222653.23898-4-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-qdarkstyle): New variable.

---

gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 47edaabc0c..2df26dffbf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23224,3 +23224,30 @@ query Watchman to discover file changes.")
       "Helpdev is a library to easily extract information about the Python
 environment.")
     (license license:expat)))
+
+(define-public python-qdarkstyle
+  (package
+    (name "python-qdarkstyle")
+    (version "2.8.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "QDarkStyle" version))
+        (sha256
+          (base32
+            "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym"))))
+    (build-system python-build-system)
+    (arguments
+      `(;; Fails unable to detect valid Qt bindings even if you
+	;; add them as native-inputs.
+	#:tests? #f))
+    (propagated-inputs
+      `(("python-helpdev" ,python-helpdev)
+        ("python-qtpy" ,python-qtpy)))
+    (home-page
+      "https://github.com/ColinDuquesnoy/QDarkStyleSheet")
+    (synopsis
+      "Complete dark stylesheet for Python and Qt applications")
+    (description
+      "QDarkStyle is the most complete dark stylesheet for Python and Qt applications.")
+    (license license:expat)))
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:26

[PATCH v4 4/8] gnu: Add python-bitstring.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227222653.23898-5-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-bitstring): New variable.

---

gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++

1 file changed, 21 insertions(+)

Toggle diff (31 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 2df26dffbf..b06f6011de 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23251,3 +23251,24 @@ environment.")
     (description
       "QDarkStyle is the most complete dark stylesheet for Python and Qt applications.")
     (license license:expat)))
+
+(define-public python-bitstring
+  (package
+    (name "python-bitstring")
+    (version "3.1.7")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "bitstring" version))
+        (sha256
+          (base32
+            "0jl6192dwrlm5ybkbh7ywmyaymrc3cmz9y07nm7qdli9n9rfpwzx"))))
+    (build-system python-build-system)
+    (home-page
+      "https://github.com/scott-griffiths/bitstring")
+    (synopsis
+      "Simple construction, analysis and modification of binary data")
+    (description
+      "Bitstring is a library for simple construction, analysis and modification
+ of binary data.")
+    (license license:expat)))
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:26

[PATCH v4 5/8] gnu: Add python-socks.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227222653.23898-6-dftxbs3e@free.fr

* gnu/packages/python-xyz.scm (python-socks): New variable.

---

gnu/packages/python-xyz.scm | 27 +++++++++++++++++++++++++++

1 file changed, 27 insertions(+)

Toggle diff (37 lines)diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b06f6011de..93e0292b28 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -23272,3 +23272,30 @@ environment.")
       "Bitstring is a library for simple construction, analysis and modification
  of binary data.")
     (license license:expat)))
+
+(define-public python-socks
+  (package
+    (name "python-socks")
+    (version "1.1.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "python-socks" version))
+        (sha256
+          (base32
+            "1y9sp0hijywjrqwpjgpq3yjmfm6s0rj1br19xm77ffk72w5pdr26"))))
+    (build-system python-build-system)
+    (propagated-inputs
+      ;; For python-socks[asyncio]
+      `(("python-async-timeout" ,python-async-timeout)))
+    (native-inputs
+      `(("python-trio" ,python-trio)
+	("python-curio" ,python-curio)))
+    (home-page
+      "https://github.com/romis2012/python-socks")
+    (synopsis
+      "Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python")
+    (description
+      "Socks is a library providing core proxy (SOCKS4, SOCKS5, HTTP tunneling)
+ functionality.")
+    (license license:asl2.0)))
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:26

[PATCH v4 6/8] gnu: python-aiohttp-socks: Update to 0.5.5.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227222653.23898-7-dftxbs3e@free.fr

* gnu/packages/python-web.scm (python-aiohttp-socks):
[version]: Bump to 0.5.5.
[propagated-inputs]: Add python-socks, python-attrs.
---
 gnu/packages/python-web.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (29 lines)diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index bdde4d90f4..0f1a6dec44 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -167,17 +167,19 @@ Callback Hell.
 (define-public python-aiohttp-socks
   (package
     (name "python-aiohttp-socks")
-    (version "0.2.2")
+    (version "0.5.5")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "aiohttp_socks" version))
        (sha256
         (base32
-         "0473702jk66xrgpm28wbdgpnak4v0dh2qmdjw7ky7hf3lwwqkggf"))))
+         "0jmhb0l1w8k1nishij3awd9zv8zbyb5l35a2pdalrqxxasbhbcif"))))
     (build-system python-build-system)
     (propagated-inputs
-     `(("python-aiohttp" ,python-aiohttp)))
+     `(("python-aiohttp" ,python-aiohttp)
+       ("python-attrs" ,python-attrs)
+       ("python-socks" ,python-socks)))
     (home-page "https://github.com/romis2012/aiohttp-socks")
     (synopsis "SOCKS proxy connector for aiohttp")
     (description "This package provides a SOCKS proxy connector for
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:26

[PATCH v4 7/8] gnu: libsecp256k1: Update to 20200615-1-dbd41db.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227222653.23898-8-dftxbs3e@free.fr

* gnu/packages/crypto.scm (libsecp256k1):
[commit]: Set to "dbd41db16a0e91b2566820898a3ab2d7dad4fe00".
[version]: Bump to 20200615-1-dbd41db.
[arguments]: Add "--enable-module-recovery",
"--enable-experimental", "--enable-module-ecdh" and
"--enable-shared" to #:configure-flags.
---
 gnu/packages/crypto.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Toggle diff (35 lines)diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm
index 1b51366d7e..f0fc1ec5a3 100644
--- a/gnu/packages/crypto.scm
+++ b/gnu/packages/crypto.scm
@@ -1028,10 +1028,10 @@ trivial to build for local use.  Portability is emphasized over performance.")
     (license license:unlicense)))
 
 (define-public libsecp256k1
-  (let ((commit "d644dda5c9dbdecee52d1aa259235510fdc2d4ee"))
+  (let ((commit "dbd41db16a0e91b2566820898a3ab2d7dad4fe00"))
     (package
       (name "libsecp256k1")
-      (version (git-version "20191213" "1" commit))
+      (version (git-version "20200615" "1" commit))
       (source (origin
                 (method git-fetch)
                 (uri (git-reference
@@ -1039,9 +1039,14 @@ trivial to build for local use.  Portability is emphasized over performance.")
                       (commit commit)))
                 (sha256
                  (base32
-                  "0zmx32746khsm2cx0p3pdy3j2vkwmafvf7axiixijhgcg0xjv93i"))
+                  "1fcpnksq5cqwqzshn5f0lq94b73p3frwbp04hgmmbnrndpqg6mpy"))
                 (file-name (git-file-name name version))))
       (build-system gnu-build-system)
+      (arguments
+	'(#:configure-flags '("--enable-module-recovery"
+			      "--enable-experimental"
+			      "--enable-module-ecdh"
+			      "--enable-shared")))
       (native-inputs
        `(("autoconf" ,autoconf)
          ("automake" ,automake)
-- 
2.29.2

John Doe wrote on 27 Dec 2020 23:26

[PATCH v4 8/8] gnu: electrum: Update to 4.0.9.

Recipients:(address . efraim@flashner.co.il)

Message-ID:20201227222653.23898-9-dftxbs3e@free.fr

* gnu/packages/finance.scm (electrum): Update to 4.0.9.
[inputs]: Remove python-pyaes, python-pysocks, python-sip,
python-pbkdf2, python-requests, python-jsonrpclib-pelix and
python-ecdsa, python-dnspython-1.16. Add python-dnspython,
python-bitstring, python-attrs, python-cryptography, python-qdarkstyle
and libsecp256k1.
[arguments]: Copy 'use-libsecp256k1-input phase from
(electron-cash) to #:phases to fix runtime lookup of libsecp256k1
library.
---
 gnu/packages/finance.scm | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

Toggle diff (69 lines)diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index c7a606f3b2..b6921d343f 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -495,7 +495,7 @@ do so.")
 (define-public electrum
   (package
     (name "electrum")
-    (version "3.3.8")
+    (version "4.0.9")
     (source
      (origin
        (method url-fetch)
@@ -503,7 +503,7 @@ do so.")
                            version "/Electrum-"
                            version ".tar.gz"))
        (sha256
-        (base32 "1g00cj1pmckd4xis8r032wmraiv3vd3zc803hnyxa2bnhj8z3bg2"))
+        (base32 "1fvjiagi78f32nxgr2rx8jas8hxfvpp1c8fpfcalvykmlhdc2gva"))
        (modules '((guix build utils)))
        (snippet
         '(begin
@@ -512,21 +512,19 @@ do so.")
            #t))))
     (build-system python-build-system)
     (inputs
-     `(("python-pyaes" ,python-pyaes)
-       ("python-pysocks" ,python-pysocks)
-       ("python-sip" ,python-sip)
-       ("python-pyqt" ,python-pyqt)
-       ("python-ecdsa" ,python-ecdsa)
-       ("python-pbkdf2" ,python-pbkdf2)
-       ("python-requests" ,python-requests)
+     `(("python-pyqt" ,python-pyqt)
        ("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-1.16)
-       ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
+       ("python-bitstring" ,python-bitstring)
+       ("python-attrs" ,python-attrs)
+       ("python-cryptography" ,python-cryptography)
+       ("python-qdarkstyle" ,python-qdarkstyle)
+       ("python-dnspython" ,python-dnspython)
+       ("libsecp256k1" ,libsecp256k1)))
     (arguments
      `(#:tests? #f                      ; no tests
        #:phases
@@ -540,7 +538,14 @@ do so.")
                (substitute* "setup.py"
                  (("sys\\.prefix")
                   (format #f "\"~a\"" out)))
-               #t))))))
+               #t)))
+         (add-after 'unpack 'use-libsecp256k1-input
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "electrum/ecc_fast.py"
+               (("library_paths = .* 'libsecp256k1.so.0'.")
+                (string-append "library_paths = ('"
+                               (assoc-ref inputs "libsecp256k1")
+                               "/lib/libsecp256k1.so.0'"))))))))
     (home-page "https://electrum.org/")
     (synopsis "Bitcoin wallet")
     (description
-- 
2.29.2

Efraim Flashner wrote on 28 Dec 2020 12:25

Re: [PATCH v4 0/8] gnu: electrum: Update to 4.0.9.

Recipients:(name . John Doe)(address . dftxbs3e@free.fr)(address . 44990-done@debbugs.gnu.org)

Message-ID:X+nAsJx0XwUCWF2o@3900XT

There were a couple of tabs which I changed to spaces and I also moved
python-socks to python-web. I followed up with enabling the test suites
on python-bitstring and python-helpdev.

-- 
Efraim Flashner   <efraim@flashner.co.il>   ????? ?????
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 44990@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date