From patchwork Mon May 11 18:16:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 22006 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 64B9227BBE3; Mon, 11 May 2020 19:22:06 +0100 (BST) 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,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,UNPARSEABLE_RELAY,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 ESMTP id 1EFC927BBE1 for ; Mon, 11 May 2020 19:22:06 +0100 (BST) Received: from localhost ([::1]:35668 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYD41-0002T5-M8 for patchwork@mira.cbaines.net; Mon, 11 May 2020 14:22:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYCz9-0005Ie-8J for guix-patches@gnu.org; Mon, 11 May 2020 14:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41680) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jYCz8-0006vA-UK for guix-patches@gnu.org; Mon, 11 May 2020 14:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jYCz8-0003E6-Pl for guix-patches@gnu.org; Mon, 11 May 2020 14:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41190] [PATCH 1/2] gnu: finance: bitcoin-core: Reformat the package definition. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 11 May 2020 18:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41190 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41190@debbugs.gnu.org Received: via spool by 41190-submit@debbugs.gnu.org id=B41190.158922102112384 (code B ref 41190); Mon, 11 May 2020 18:17:02 +0000 Received: (at 41190) by debbugs.gnu.org; 11 May 2020 18:17:01 +0000 Received: from localhost ([127.0.0.1]:53225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYCz7-0003Da-F7 for submit@debbugs.gnu.org; Mon, 11 May 2020 14:17:01 -0400 Received: from mira.cbaines.net ([212.71.252.8]:51302) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jYCz5-0003DL-G5 for 41190@debbugs.gnu.org; Mon, 11 May 2020 14:16:59 -0400 Received: from localhost (unknown [46.237.174.28]) by mira.cbaines.net (Postfix) with ESMTPSA id A4F0C27BBE1 for <41190@debbugs.gnu.org>; Mon, 11 May 2020 19:16:58 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 82d38ae2 for <41190@debbugs.gnu.org>; Mon, 11 May 2020 18:16:56 +0000 (UTC) From: Christopher Baines Date: Mon, 11 May 2020 19:16:55 +0100 Message-Id: <20200511181656.25849-1-mail@cbaines.net> X-Mailer: git-send-email 2.26.2 In-Reply-To: <87h7wmpcsk.fsf@cbaines.net> References: <87h7wmpcsk.fsf@cbaines.net> 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 Change the indentation to match what Emacs does. * gnu/packages/finance.scm (bitcoin-core): Change indentation of many lines. --- gnu/packages/finance.scm | 65 ++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index dfc89cae1e..094b25c9fe 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -104,13 +104,13 @@ (name "bitcoin-core") (version "0.19.1") (source (origin - (method url-fetch) - (uri - (string-append "https://bitcoincore.org/bin/bitcoin-core-" - version "/bitcoin-" version ".tar.gz")) - (sha256 - (base32 - "1h3w7brc18145np920vy7j5ms5hym59hvr40swdjx34fbdaisngj")))) + (method url-fetch) + (uri + (string-append "https://bitcoincore.org/bin/bitcoin-core-" + version "/bitcoin-" version ".tar.gz")) + (sha256 + (base32 + "1h3w7brc18145np920vy7j5ms5hym59hvr40swdjx34fbdaisngj")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -127,35 +127,36 @@ ("qtbase" ,qtbase))) (arguments `(#:configure-flags - (list - ;; Boost is not found unless specified manually. - (string-append "--with-boost=" - (assoc-ref %build-inputs "boost")) - ;; XXX: The configure script looks up Qt paths by - ;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick - ;; up executables residing in 'qttools', so we specify them here. - (string-append "ac_cv_path_LRELEASE=" - (assoc-ref %build-inputs "qttools") - "/bin/lrelease") - (string-append "ac_cv_path_LUPDATE=" - (assoc-ref %build-inputs "qttools") - "/bin/lupdate")) + (list + ;; Boost is not found unless specified manually. + (string-append "--with-boost=" + (assoc-ref %build-inputs "boost")) + ;; XXX: The configure script looks up Qt paths by + ;; `pkg-config --variable=host_bins Qt5Core`, which fails to pick + ;; up executables residing in 'qttools', so we specify them here. + (string-append "ac_cv_path_LRELEASE=" + (assoc-ref %build-inputs "qttools") + "/bin/lrelease") + (string-append "ac_cv_path_LUPDATE=" + (assoc-ref %build-inputs "qttools") + "/bin/lupdate")) #:phases - (modify-phases %standard-phases - (add-before 'configure 'make-qt-deterministic + (modify-phases %standard-phases + (add-before 'configure 'make-qt-deterministic (lambda _ - ;; Make Qt deterministic. - (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") - #t)) - (add-before 'check 'set-home + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") + #t)) + (add-before 'check 'set-home (lambda _ - (setenv "HOME" (getenv "TMPDIR")) ; tests write to $HOME - #t)) - (add-after 'check 'check-functional + (setenv "HOME" (getenv "TMPDIR")) ; tests write to $HOME + #t)) + (add-after 'check 'check-functional (lambda _ - (invoke "python3" "./test/functional/test_runner.py" - (string-append "--jobs=" (number->string (parallel-job-count)))) - #t))))) + (invoke + "python3" "./test/functional/test_runner.py" + (string-append "--jobs=" (number->string (parallel-job-count)))) + #t))))) (home-page "https://bitcoin.org/en/") (synopsis "Bitcoin peer-to-peer client") (description