From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6KaYMhTh01/KZAAA0tVLHw (envelope-from ) for ; Fri, 11 Dec 2020 21:13:56 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id aOlcLhTh01+uFQAAB5/wlQ (envelope-from ) for ; Fri, 11 Dec 2020 21:13:56 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7E072940111 for ; Fri, 11 Dec 2020 21:13:56 +0000 (UTC) Received: from localhost ([::1]:42048 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knpjf-0004Um-F1 for larch@yhetil.org; Fri, 11 Dec 2020 16:13:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knpB5-0006T2-Vx for guix-patches@gnu.org; Fri, 11 Dec 2020 15:38:12 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60110) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1knpB4-0002cS-RR for guix-patches@gnu.org; Fri, 11 Dec 2020 15:38:11 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1knpB4-0001Xw-OR for guix-patches@gnu.org; Fri, 11 Dec 2020 15:38:10 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44990] [PATCH v2 8/8] gnu: electrum: Update to 4.0.7. Resent-From: =?UTF-8?Q?L=C3=A9o?= Le Bouter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Dec 2020 20:38:10 +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: 44990@debbugs.gnu.org Received: via spool by 44990-submit@debbugs.gnu.org id=B44990.16077190895928 (code B ref 44990); Fri, 11 Dec 2020 20:38:10 +0000 Received: (at 44990) by debbugs.gnu.org; 11 Dec 2020 20:38:09 +0000 Received: from localhost ([127.0.0.1]:43420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knpB2-0001XM-WE for submit@debbugs.gnu.org; Fri, 11 Dec 2020 15:38:09 -0500 Received: from smtp2-g21.free.fr ([212.27.42.2]:57418) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1knobb-0006of-AX for 44990@debbugs.gnu.org; Fri, 11 Dec 2020 15:01:31 -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 AF3742003E0 for <44990@debbugs.gnu.org>; Fri, 11 Dec 2020 21:01:28 +0100 (CET) Date: Fri, 11 Dec 2020 21:01:05 +0100 Message-Id: <20201211200105.21995-8-lle-bout@zaclys.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201211200105.21995-1-lle-bout@zaclys.net> References: <20201211200105.21995-1-lle-bout@zaclys.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Fri, 11 Dec 2020 15:37:58 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Fri, 11 Dec 2020 16:11:23 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Léo Le Bouter , Léo Le Bouter via Guix-patches From: Léo Le Bouter via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.20 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 7E072940111 X-Spam-Score: 2.20 X-Migadu-Scanner: scn1.migadu.com X-TUID: iQKWhL/Mh9c7 From: John Doe * 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(-) 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