[PATCH 0/4] Add electrum

[PATCH 0/4] Add electrum

[Carlo Zancanaro]

These patches are to add Electrum, a Bitcoin client. The three python
libraries are the only dependencies that weren't already packaged. They're
mostly just from the pypi importer and they seem correct to me.

Carlo Zancanaro (4):
  gnu: Add python-pbkdf2.
  gnu: Add python-qrcode.
  gnu: Add python2-slowaes
  gnu: Add electrum.

 gnu/packages/finance.scm | 50 ++++++++++++++++++++++++++++++++++
 gnu/packages/python.scm  | 71 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+)

-- 
2.11.0

[PATCH 1/4] gnu: Add python-pbkdf2.

[Carlo Zancanaro]

* gnu/packages/python.scm (python-pbkdf2, python2-pbkdf2): New variables.
---
 gnu/packages/python.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index fce62175b..2841830f0 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -34,6 +34,7 @@
 ;;; Copyright © 2016 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
+;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -12268,3 +12269,27 @@ possible on all supported Python versions.")
 
 (define-public python2-xopen
   (package-with-python2 python-xopen))
+
+(define-public python-pbkdf2
+  (package
+    (name "python-pbkdf2")
+    (version "1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pbkdf2" version))
+       (sha256
+        (base32
+         "0yb99rl2mbsaamj571s1mf6vgniqh23v98k4632150hjkwv9fqxc"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page
+     "http://www.dlitz.net/software/python-pbkdf2/")
+    (synopsis "PKCS#5 v2.0 PBKDF2 Module")
+    (description "This module implements the password-based key derivation
+function, PBKDF2, specified in RSA PKCS#5 v2.0.")
+    (license license:expat)))
+
+(define-public python2-pbkdf2
+  (package-with-python2 python-pbkdf2))
-- 
2.11.0

[PATCH 2/4] gnu: Add python-qrcode.

[Carlo Zancanaro]

* gnu/packages/python.scm (python-qrcode, python2-qrcode): New variables.
---
 gnu/packages/python.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 2841830f0..9afb2f0b1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12293,3 +12293,27 @@ function, PBKDF2, specified in RSA PKCS#5 v2.0.")
 
 (define-public python2-pbkdf2
   (package-with-python2 python-pbkdf2))
+
+(define-public python-qrcode
+  (package
+    (name "python-qrcode")
+    (version "5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "qrcode" version))
+       (sha256
+        (base32
+         "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page
+     "https://github.com/lincolnloop/python-qrcode")
+    (synopsis "QR Code image generator")
+    (description "This module uses image libraries, Python Imaging
+Library (PIL) by default, to generate QR Codes.")
+    (license license:bsd-3)))
+
+(define-public python2-qrcode
+  (package-with-python2 python-qrcode))
-- 
2.11.0

[PATCH 3/4] gnu: Add python2-slowaes

[Carlo Zancanaro]

* gnu/packages/python.scm (python2-slowaes): New variable.
---
 gnu/packages/python.scm | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9afb2f0b1..eb238fc1e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12317,3 +12317,25 @@ Library (PIL) by default, to generate QR Codes.")
 
 (define-public python2-qrcode
   (package-with-python2 python-qrcode))
+
+;; SlowAES isn't compatible with Python 3.
+(define-public python2-slowaes
+  (package
+    (name "python-slowaes")
+    (version "0.1a1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "slowaes" version))
+       (sha256
+        (base32
+         "02dzajm83a7lqgxf6r3hgj64wfmcxz8gs4nvgxpvj5n19kjqlrc3"))))
+    (build-system python-build-system)
+    (arguments `(#:python ,python-2))
+    (propagated-inputs
+     `(("python-setuptools" ,python-setuptools)))
+    (home-page "http://code.google.com/p/slowaes/")
+    (synopsis "Implementation of AES in Python")
+    (description "This module implements the AES encryption algorithm in
+python.")
+    (license license:asl2.0)))
-- 
2.11.0

[PATCH 4/4] gnu: Add electrum.

[Carlo Zancanaro]

* gnu/packages/finance.scm (electrum): New variable.
---
 gnu/packages/finance.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 792482782..ee90c38eb 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,6 +27,7 @@
  #:use-module (guix build utils)
  #:use-module (guix build-system gnu)
  #:use-module (guix build-system cmake)
+ #:use-module (guix build-system python)
  #:use-module (gnu packages base)
  #:use-module (gnu packages boost)
  #:use-module (gnu packages databases)
@@ -240,3 +242,52 @@ allow to do that off the ERiC library (which is proprietary however).
 It's not clear at the moment whether one day it will be possible to
 do so.")
     (license license:agpl3+)))
+
+(define-public electrum
+  (package
+    (name "electrum")
+    (version "2.7.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://download.electrum.org/"
+                           version "/Electrum-"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "0vxdfl208if7mdsnva1jg37bnay2dsz3ww157aqwcv1j6512fi1n"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Delete the bundled dependencies.
+           (delete-file-recursively "packages")
+           #t))))
+    (build-system python-build-system)
+    (inputs
+     `(("python-slowaes" ,python2-slowaes)
+       ("python-sip" ,python2-sip)
+       ("python-pyqt" ,python2-pyqt-4)
+       ("python-ecdsa" ,python2-ecdsa)
+       ("python-pbkdf2" ,python2-pbkdf2)
+       ("python-requests" ,python2-requests)
+       ("python-qrcode" ,python2-qrcode)
+       ("python-protobuf" ,python2-protobuf)
+       ("python-dnspython" ,python2-dnspython)
+       ("python-jsonrpclib" ,python2-jsonrpclib)))
+    (arguments
+     `(#:python ,python-2
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'build 'patch-home
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "setup.py"
+               (("~/.local/share")
+                (string-append (assoc-ref outputs "out") "/local/share"))))))))
+    (home-page "https://electrum.org/")
+    (synopsis "Bitcoin wallet")
+    (description
+     "Electrum is a lightweight Bitcoin client, based on a client-server
+protocol.  It supports Simple Payment Verification (SPV) and deterministic key
+generation from a seed.  Your secret keys are encrypted and are never sent to
+other machines/servers.  Electrum does not download the Bitcoin blockchain.")
+    (license license:expat)))
-- 
2.11.0

Re: [PATCH 1/4] gnu: Add python-pbkdf2.

[Hartmut Goebel]

Am 02.01.2017 um 14:32 schrieb Carlo Zancanaro:
> +    (propagated-inputs
> +     `(("python-setuptools" ,python-setuptools)))

Any reason setuptools are a propagated input? setuptool installed by
default, as desribed in the manual.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: [PATCH 2/4] gnu: Add python-qrcode.

[Hartmut Goebel]

Am 02.01.2017 um 14:32 schrieb Carlo Zancanaro:
> +    (description "This module uses image libraries, Python Imaging
> +Library (PIL) by default, to generate QR Codes.")

Please be a bit more verbose here. AFAIK qr is also able to output
QR-codes to the console.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

Re: [PATCH 1/4] gnu: Add python-pbkdf2.

[Hartmut Goebel]

Am 02.01.2017 um 14:32 schrieb Carlo Zancanaro:
> +    (synopsis "PKCS#5 v2.0 PBKDF2 Module")
> +    (description "This module implements the password-based key derivation
> +function, PBKDF2, specified in RSA PKCS#5 v2.0.")

Please be less cryptic in the synopsis. "password-based key derivation"
should be stated there. Maybe debian provides a good synopsis and
description.

-- 
Regards
Hartmut Goebel

| Hartmut Goebel          | h.goebel@crazy-compilers.com               |
| www.crazy-compilers.com | compilers which you thought are impossible |

[PATCH 1/4] gnu: Add python-pbkdf2.

[Carlo Zancanaro]

* gnu/packages/python.scm (python-pbkdf2, python2-pbkdf2): New variables.
---
 gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 6a5b0c4f1..21347b25e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -34,6 +34,7 @@
 ;;; Copyright © 2016 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2016, 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
+;;; Copyright © 2017 Carlo Zancanaro <carlo@zancanaro.id.au>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -12462,3 +12463,31 @@ Features:
 @item Compiles templates into optimized, yet readable, Python code.
 @end enumerate")
     (license (license:x11-style "file://LICENSE"))))
+
+(define-public python-pbkdf2
+  (package
+    (name "python-pbkdf2")
+    (version "1.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "pbkdf2" version))
+       (sha256
+        (base32
+         "0yb99rl2mbsaamj571s1mf6vgniqh23v98k4632150hjkwv9fqxc"))))
+    (build-system python-build-system)
+    (home-page "http://www.dlitz.net/software/python-pbkdf2/")
+    (synopsis "Password-based key derivation")
+    (description "This module implements the password-based key derivation
+function, PBKDF2, specified in RSA PKCS#5 v2.0.
+
+PKCS#5 v2.0 Password-Based Key Derivation is a key derivation function which
+is part of the RSA Public Key Cryptography Standards series.  The provided
+implementation takes a password or a passphrase and a salt value (and
+optionally a iteration count, a digest module, and a MAC module) and provides
+a file-like object from which an arbitrarly-sized key can be read.")
+    (license license:expat)))
+
+(define-public python2-pbkdf2
+  (package-with-python2 python-pbkdf2))
+
-- 
2.11.0

[PATCH 2/4] gnu: Add python-qrcode.

[Carlo Zancanaro]

* gnu/packages/python.scm (python-qrcode, python2-qrcode): New variables.
---
 gnu/packages/python.scm | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 21347b25e..0ee1b6ef8 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12491,3 +12491,28 @@ a file-like object from which an arbitrarly-sized key can be read.")
 (define-public python2-pbkdf2
   (package-with-python2 python-pbkdf2))
 
+(define-public python-qrcode
+  (package
+    (name "python-qrcode")
+    (version "5.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "qrcode" version))
+       (sha256
+        (base32
+         "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1"))))
+    (build-system python-build-system)
+    (home-page "https://github.com/lincolnloop/python-qrcode")
+    (synopsis "QR Code image generator")
+    (description "This package provides a pure Python QR Code generator
+module.  It uses the Python Imaging Library (PIL) to allow for the generation
+of QR Codes.
+
+In addition this package provides a command line tool to generate QR codes and
+either write these QR codes to a file or do the output as ascii art at the
+console.")
+    (license license:bsd-3)))
+
+(define-public python2-qrcode
+  (package-with-python2 python-qrcode))
-- 
2.11.0

[PATCH 3/4] gnu: Add python2-slowaes

[Carlo Zancanaro]

* gnu/packages/python.scm (python2-slowaes): New variable.
---
 gnu/packages/python.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0ee1b6ef8..ad62c25e8 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -12516,3 +12516,24 @@ console.")
 
 (define-public python2-qrcode
   (package-with-python2 python-qrcode))
+
+;; SlowAES isn't compatible with Python 3.
+(define-public python2-slowaes
+  (package
+    (name "python-slowaes")
+    (version "0.1a1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "slowaes" version))
+       (sha256
+        (base32
+         "02dzajm83a7lqgxf6r3hgj64wfmcxz8gs4nvgxpvj5n19kjqlrc3"))))
+    (build-system python-build-system)
+    (arguments `(#:python ,python-2))
+    (home-page "http://code.google.com/p/slowaes/")
+    (synopsis "Implementation of AES in Python")
+    (description "This package contains an implementation of AES in Python.
+This implementation is slow (hence the project name) but still useful when
+faster ones are not available.")
+    (license license:asl2.0)))
-- 
2.11.0

Re: [PATCH 1/4] gnu: Add python-pbkdf2.

[宋文武]

Carlo Zancanaro <carlo@zancanaro.id.au> writes:

> * gnu/packages/python.scm (python-pbkdf2, python2-pbkdf2): New variables.
> ---
>  gnu/packages/python.scm | 29 +++++++++++++++++++++++++++++
>  1 file changed, 29 insertions(+)

I applied it with adding ‘python-pycrypto’ as ‘propagated-inputs’ (as
prefered by pbkdf2.py).

Thank you!

Re: [PATCH 2/4] gnu: Add python-qrcode.

[宋文武]

Carlo Zancanaro <carlo@zancanaro.id.au> writes:

> * gnu/packages/python.scm (python-qrcode, python2-qrcode): New variables.
> ---
>  gnu/packages/python.scm | 25 +++++++++++++++++++++++++
>  1 file changed, 25 insertions(+)
>

Thank you!

I applied it with adding ‘python-lxml’, ‘python-pillow’ and ‘python-six’
as ‘propagated-inputs’.

It can also use ‘python-pymaging’ for pure python PNG output (instead of
PIL or Pillow which use native system libraries), but we don’t have
pymaging packaged yet and I think it’s not useful if we already make PIL
available.

Re: [PATCH 3/4] gnu: Add python2-slowaes

[宋文武]

Carlo Zancanaro <carlo@zancanaro.id.au> writes:

> * gnu/packages/python.scm (python2-slowaes): New variable.
> ---
>  gnu/packages/python.scm | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
>

Applied with changing package name to ‘python2-slowase’.

Thank you!

Re: [PATCH 4/4] gnu: Add electrum.

[Carlo Zancanaro]

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

On Mon, Jan 02 2017, Carlo Zancanaro wrote
> ... patch used to be here ...

Now that the patches for its dependencies have been pushed, can anyone
review this patch for Electrum?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

Re: [PATCH 4/4] gnu: Add electrum.

[Ludovic Courtès]

Carlo Zancanaro <carlo@zancanaro.id.au> skribis:

> On Mon, Jan 02 2017, Carlo Zancanaro wrote
>> ... patch used to be here ...
>
> Now that the patches for its dependencies have been pushed, can anyone
> review this patch for Electrum?

Done and applied.  :-)

Thank you!

Ludo’.