* [bug#29169] Update electrum to 3.0
@ 2017-11-06 11:49 Carlo Zancanaro
2017-11-06 11:56 ` [bug#29169] Updated patch for python-jsonrpclib-pelix Carlo Zancanaro
2017-11-06 22:59 ` bug#29169: Update electrum to 3.0 Ludovic Courtès
0 siblings, 2 replies; 4+ messages in thread
From: Carlo Zancanaro @ 2017-11-06 11:49 UTC (permalink / raw)
To: 29169
[-- Attachment #1.1: Type: text/plain, Size: 86 bytes --]
Electrum recently updated to version 3.0. This included a move to
python3 and pyqt5.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-python-jsonrpclib-pelix.patch --]
[-- Type: text/x-diff, Size: 1860 bytes --]
From 9ad15d684ece91b2bd869e2b568f47d42d4e4c48 Mon Sep 17 00:00:00 2001
From: Carlo Zancanaro <carlo@zancanaro.id.au>
Date: Mon, 6 Nov 2017 22:39:11 +1100
Subject: [PATCH 1/2] gnu: Add python-jsonrpclib-pelix.
* gnu/packages/python.scm (python-jsonrpclib-pelix, python2-jsonrpclib-pelix):
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 e8a733919..8a6a8e278 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -16871,3 +16871,32 @@ executed more than a given number of times during a given period.")
(define-public python2-ratelimiter
(package-with-python2 python-ratelimiter))
+
+(define-public python-jsonrpclib-pelix
+ (package
+ (name "python-jsonrpclib-pelix")
+ (version "0.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "jsonrpclib-pelix" version))
+ (sha256
+ (base32
+ "1qs95vxplxwspbrqy8bvc195s58iy43qkf75yrjfql2sim8b25sl"))))
+ (build-system python-build-system)
+ (home-page
+ "http://github.com/tcalmant/jsonrpclib/")
+ (synopsis
+ "This project is an implementation of the JSON-RPC v2.0
+specification (backwards-compatible) as a client library, for Python 2.7 and
+Python 3.This version is a fork of jsonrpclib by Josh Marshall, usable with
+Pelix remote services.")
+ (description
+ "This project is an implementation of the JSON-RPC v2.0
+specification (backwards-compatible) as a client library, for Python 2.7 and
+Python 3.This version is a fork of jsonrpclib by Josh Marshall, usable with
+Pelix remote services.")
+ (license #f)))
+
+(define-public python2-jsonrpclib-pelix
+ (package-with-python2 python-jsonrpclib-pelix))
--
2.14.3
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-electrum-Update-to-3.0.patch --]
[-- Type: text/x-diff, Size: 2451 bytes --]
From ff32be8c9ef2f2afab933cf562c47f9f21e0eda6 Mon Sep 17 00:00:00 2001
From: Carlo Zancanaro <carlo@zancanaro.id.au>
Date: Mon, 6 Nov 2017 22:40:28 +1100
Subject: [PATCH 2/2] gnu: electrum: Update to 3.0.
gnu/packages/finance.scm (electrum): Update to 3.0.
[inputs]: Change to python3 inputs.
[arguments]: Remove python-2. Disable tests.
---
gnu/packages/finance.scm | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 50c9dd787..8b9a911d8 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -265,7 +265,7 @@ do so.")
(define-public electrum
(package
(name "electrum")
- (version "2.9.3")
+ (version "3.0")
(source
(origin
(method url-fetch)
@@ -274,7 +274,7 @@ do so.")
version ".tar.gz"))
(sha256
(base32
- "0d0fzb653g7b8ka3x90nl21md4g3n1fv11czdxpdq3s9yr6js6f2"))
+ "184cmpfqcznnm0wfjiarb6dps2vs0s2aykmy2ji7p77x20fbisfi"))
(modules '((guix build utils)))
(snippet
'(begin
@@ -283,19 +283,19 @@ do so.")
#t))))
(build-system python-build-system)
(inputs
- `(("python-pyaes" ,python2-pyaes)
- ("python-pysocks" ,python2-pysocks)
- ("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)))
+ `(("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-qrcode" ,python-qrcode)
+ ("python-protobuf" ,python-protobuf)
+ ("python-dnspython" ,python-dnspython)
+ ("python-jsonrpclib-pelix" ,python-jsonrpclib-pelix)))
(arguments
- `(#:python ,python-2
+ `(#:tests? #f ;; package doesn't have any tests
#:phases
(modify-phases %standard-phases
(add-before 'build 'patch-home
--
2.14.3
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#29169] Updated patch for python-jsonrpclib-pelix
2017-11-06 11:49 [bug#29169] Update electrum to 3.0 Carlo Zancanaro
@ 2017-11-06 11:56 ` Carlo Zancanaro
2017-11-06 22:36 ` Ludovic Courtès
2017-11-06 22:59 ` bug#29169: Update electrum to 3.0 Ludovic Courtès
1 sibling, 1 reply; 4+ messages in thread
From: Carlo Zancanaro @ 2017-11-06 11:56 UTC (permalink / raw)
To: 29169
[-- Attachment #1.1: Type: text/plain, Size: 173 bytes --]
Whoops! I forgot to update my master branch before sending those patches
out. The python-jsonrpclib-pelix patch might not apply cleanly. Here's
an updated one that should.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-python-jsonrpclib-pelix.patch --]
[-- Type: text/x-diff, Size: 1812 bytes --]
From 38646c4dbcf5c7dfe85e7685acfeab72da6a69db Mon Sep 17 00:00:00 2001
From: Carlo Zancanaro <carlo@zancanaro.id.au>
Date: Mon, 6 Nov 2017 22:39:11 +1100
Subject: [PATCH 1/2] gnu: Add python-jsonrpclib-pelix.
* gnu/packages/python.scm (python-jsonrpclib-pelix, python2-jsonrpclib-pelix):
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 e506f6dfd..090069ab2 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -16897,3 +16897,32 @@ embeddable JavaScript engine.")
(define-public python2-dukpy
(package-with-python2 python-dukpy))
+
+(define-public python-jsonrpclib-pelix
+ (package
+ (name "python-jsonrpclib-pelix")
+ (version "0.3.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "jsonrpclib-pelix" version))
+ (sha256
+ (base32
+ "1qs95vxplxwspbrqy8bvc195s58iy43qkf75yrjfql2sim8b25sl"))))
+ (build-system python-build-system)
+ (home-page
+ "http://github.com/tcalmant/jsonrpclib/")
+ (synopsis
+ "This project is an implementation of the JSON-RPC v2.0
+specification (backwards-compatible) as a client library, for Python 2.7 and
+Python 3.This version is a fork of jsonrpclib by Josh Marshall, usable with
+Pelix remote services.")
+ (description
+ "This project is an implementation of the JSON-RPC v2.0
+specification (backwards-compatible) as a client library, for Python 2.7 and
+Python 3.This version is a fork of jsonrpclib by Josh Marshall, usable with
+Pelix remote services.")
+ (license #f)))
+
+(define-public python2-jsonrpclib-pelix
+ (package-with-python2 python-jsonrpclib-pelix))
--
2.14.3
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#29169] Updated patch for python-jsonrpclib-pelix
2017-11-06 11:56 ` [bug#29169] Updated patch for python-jsonrpclib-pelix Carlo Zancanaro
@ 2017-11-06 22:36 ` Ludovic Courtès
0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2017-11-06 22:36 UTC (permalink / raw)
To: Carlo Zancanaro; +Cc: 29169
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
Hi Carlo,
Carlo Zancanaro <carlo@zancanaro.id.au> skribis:
> From 38646c4dbcf5c7dfe85e7685acfeab72da6a69db Mon Sep 17 00:00:00 2001
> From: Carlo Zancanaro <carlo@zancanaro.id.au>
> Date: Mon, 6 Nov 2017 22:39:11 +1100
> Subject: [PATCH 1/2] gnu: Add python-jsonrpclib-pelix.
>
> * gnu/packages/python.scm (python-jsonrpclib-pelix, python2-jsonrpclib-pelix):
> New variables.
Applied with the changes below. Please make sure to run ‘guix lint’
next time. :-)
Thanks,
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1418 bytes --]
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 090069ab2..5b11a6371 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -16910,19 +16910,14 @@ embeddable JavaScript engine.")
(base32
"1qs95vxplxwspbrqy8bvc195s58iy43qkf75yrjfql2sim8b25sl"))))
(build-system python-build-system)
- (home-page
- "http://github.com/tcalmant/jsonrpclib/")
- (synopsis
- "This project is an implementation of the JSON-RPC v2.0
-specification (backwards-compatible) as a client library, for Python 2.7 and
-Python 3.This version is a fork of jsonrpclib by Josh Marshall, usable with
-Pelix remote services.")
- (description
- "This project is an implementation of the JSON-RPC v2.0
-specification (backwards-compatible) as a client library, for Python 2.7 and
-Python 3.This version is a fork of jsonrpclib by Josh Marshall, usable with
-Pelix remote services.")
- (license #f)))
+ (home-page "https://github.com/tcalmant/jsonrpclib/")
+ (synopsis "JSON-RPC 2.0 client library for Python")
+ (description
+ "This library implements the JSON-RPC v2.0
+specification (backwards-compatible) as a client library for Python. This
+version is a fork of jsonrpclib by Josh Marshall, usable with Pelix remote
+services.")
+ (license license:asl2.0)))
(define-public python2-jsonrpclib-pelix
(package-with-python2 python-jsonrpclib-pelix))
^ permalink raw reply related [flat|nested] 4+ messages in thread
* bug#29169: Update electrum to 3.0
2017-11-06 11:49 [bug#29169] Update electrum to 3.0 Carlo Zancanaro
2017-11-06 11:56 ` [bug#29169] Updated patch for python-jsonrpclib-pelix Carlo Zancanaro
@ 2017-11-06 22:59 ` Ludovic Courtès
1 sibling, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2017-11-06 22:59 UTC (permalink / raw)
To: Carlo Zancanaro; +Cc: 29169-done
Carlo Zancanaro <carlo@zancanaro.id.au> skribis:
> From ff32be8c9ef2f2afab933cf562c47f9f21e0eda6 Mon Sep 17 00:00:00 2001
> From: Carlo Zancanaro <carlo@zancanaro.id.au>
> Date: Mon, 6 Nov 2017 22:40:28 +1100
> Subject: [PATCH 2/2] gnu: electrum: Update to 3.0.
>
> gnu/packages/finance.scm (electrum): Update to 3.0.
> [inputs]: Change to python3 inputs.
> [arguments]: Remove python-2. Disable tests.
Applied, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-11-06 23:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-06 11:49 [bug#29169] Update electrum to 3.0 Carlo Zancanaro
2017-11-06 11:56 ` [bug#29169] Updated patch for python-jsonrpclib-pelix Carlo Zancanaro
2017-11-06 22:36 ` Ludovic Courtès
2017-11-06 22:59 ` bug#29169: Update electrum to 3.0 Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).