From patchwork Sun Dec 27 22:13:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dftxbs3e X-Patchwork-Id: 26002 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 C1A6E27BC09; Sun, 27 Dec 2020 22:16: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 6C20A27BC05 for ; Sun, 27 Dec 2020 22:16:21 +0000 (GMT) Received: from localhost ([::1]:40252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kteKq-0005u4-IY for patchwork@mira.cbaines.net; Sun, 27 Dec 2020 17:16:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kteKZ-0005oE-7T for guix-patches@gnu.org; Sun, 27 Dec 2020 17:16:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kteKY-0005Cx-WC for guix-patches@gnu.org; Sun, 27 Dec 2020 17:16:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kteKY-0007if-SD for guix-patches@gnu.org; Sun, 27 Dec 2020 17:16:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44990] [PATCH v3 8/8] gnu: electrum: Update to 4.0.9. Resent-From: John Doe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 27 Dec 2020 22:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44990 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: efraim@flashner.co.il Received: via spool by 44990-submit@debbugs.gnu.org id=B44990.160910731429599 (code B ref 44990); Sun, 27 Dec 2020 22:16:02 +0000 Received: (at 44990) by debbugs.gnu.org; 27 Dec 2020 22:15:14 +0000 Received: from localhost ([127.0.0.1]:33745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kteJl-0007hL-L2 for submit@debbugs.gnu.org; Sun, 27 Dec 2020 17:15:13 -0500 Received: from smtp2-g21.free.fr ([212.27.42.2]:7932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kteJj-0007hC-Cw for 44990@debbugs.gnu.org; Sun, 27 Dec 2020 17:15:11 -0500 Received: from localhost.localdomain (unknown [IPv6:2a01:e0a:2a2:1350:cd10:777c:7b57:3bb6]) (Authenticated sender: dftxbs3e) by smtp2-g21.free.fr (Postfix) with ESMTPSA id DC163200390; Sun, 27 Dec 2020 23:15:04 +0100 (CET) From: John Doe Date: Sun, 27 Dec 2020 23:13:33 +0100 Message-Id: <20201227221333.23351-9-dftxbs3e@free.fr> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201227221333.23351-1-dftxbs3e@free.fr> References: <20201227221333.23351-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: , Cc: 44990@debbugs.gnu.org, John Doe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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(-) 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