From patchwork Tue Dec 1 11:25:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dftxbs3e X-Patchwork-Id: 25511 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 282E927BBF9; Tue, 1 Dec 2020 11:27:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 91A7427BBF8 for ; Tue, 1 Dec 2020 11:27:20 +0000 (GMT) Received: from localhost ([::1]:49878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kk3oV-0002qI-NU for patchwork@mira.cbaines.net; Tue, 01 Dec 2020 06:27:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kk3nJ-0001wK-5Z for guix-patches@gnu.org; Tue, 01 Dec 2020 06:26:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kk3nI-00057V-SX for guix-patches@gnu.org; Tue, 01 Dec 2020 06:26:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kk3nI-0003Lm-PO for guix-patches@gnu.org; Tue, 01 Dec 2020 06:26:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44987] [PATCH 7/7] gnu: electrum: Update to 4.0.5. Resent-From: dftxbs3e@free.fr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Dec 2020 11:26:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44987 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44987@debbugs.gnu.org Cc: John Doe Received: via spool by 44987-submit@debbugs.gnu.org id=B44987.160682196112826 (code B ref 44987); Tue, 01 Dec 2020 11:26:04 +0000 Received: (at 44987) by debbugs.gnu.org; 1 Dec 2020 11:26:01 +0000 Received: from localhost ([127.0.0.1]:58112 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk3nE-0003Kn-QM for submit@debbugs.gnu.org; Tue, 01 Dec 2020 06:26:01 -0500 Received: from smtp4-g21.free.fr ([212.27.42.4]:45780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk3nD-0003Kg-7E for 44987@debbugs.gnu.org; Tue, 01 Dec 2020 06:26:00 -0500 Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:2a2:1350:9527:5c74:ee6c:113c]) by smtp4-g21.free.fr (Postfix) with ESMTP id 5CD8719F57C; Tue, 1 Dec 2020 12:25:55 +0100 (CET) From: dftxbs3e@free.fr Date: Tue, 1 Dec 2020 12:25:30 +0100 Message-Id: <20201201112530.262013-7-dftxbs3e@free.fr> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201201112530.262013-1-dftxbs3e@free.fr> References: <20201201112530.262013-1-dftxbs3e@free.fr> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: John Doe * 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(-) 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