GNU bug report logs - #41190
[PATCH 0/2] Fix bitcoin-core build.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 41190 in the body.
You can then email your comments to 41190 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: guix-patches <at> gnu.org
Subject: [PATCH 0/2] Fix bitcoin-core build.
Date: Mon, 11 May 2020 19:05:47 +0100

[Message part 1 (text/plain, inline)]

Christopher Baines (2):
  gnu: finance: bitcoin-core: Reformat the package definition.
  gnu: finance: bitcoin-core: Disable a test that spuriously fails.

 gnu/packages/finance.scm | 69 +++++++++++++++++++++-------------------
 1 file changed, 37 insertions(+), 32 deletions(-)

[signature.asc (application/pgp-signature, inline)]

Message #8 received at 41190 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: 41190 <at> debbugs.gnu.org
Subject: [PATCH 2/2] gnu: finance: bitcoin-core: Disable a test that
 spuriously fails.
Date: Mon, 11 May 2020 19:16:56 +0100

* gnu/packages/finance.scm (bitcoin-core)[arguments]: Disable a test.
---
 gnu/packages/finance.scm | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 094b25c9fe..85023f556c 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -155,6 +155,10 @@
            (lambda _
              (invoke
               "python3" "./test/functional/test_runner.py"
+              ;; Test fails due to Python deprecation warning in the
+              ;; test. This is fixed upstream
+              ;; https://github.com/bitcoin/bitcoin/pull/17931
+              "--exclude=p2p_invalid_messages"
               (string-append "--jobs=" (number->string (parallel-job-count))))
              #t)))))
     (home-page "https://bitcoin.org/en/")
-- 
2.26.2

Message #11 received at 41190 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: 41190 <at> debbugs.gnu.org
Subject: [PATCH 1/2] gnu: finance: bitcoin-core: Reformat the package
 definition.
Date: Mon, 11 May 2020 19:16:55 +0100

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
-- 
2.26.2

Message #14 received at 41190 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Christopher Baines <mail <at> cbaines.net>, 41190 <at> debbugs.gnu.org
Subject: Re: [bug#41190] [PATCH 2/2] gnu: finance: bitcoin-core: Disable a
 test that spuriously fails.
Date: Mon, 11 May 2020 22:08:10 +0200

[Message part 1 (text/plain, inline)]

Christopher Baines <mail <at> cbaines.net> writes:

> * gnu/packages/finance.scm (bitcoin-core)[arguments]: Disable a test.

Uff, I pushed a fix for this in 46bbdef24701db8e61326b0645fd426a17111a11
that took the upstream patch.

You are too polite, asking for reviews instead of pushing straight to
master!  :-P

Sorry for the duplicate work.

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 41190 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Christopher Baines <mail <at> cbaines.net>, 41190 <at> debbugs.gnu.org
Subject: Re: [bug#41190] [PATCH 1/2] gnu: finance: bitcoin-core: Reformat the
 package definition.
Date: Mon, 11 May 2020 22:08:51 +0200

[Message part 1 (text/plain, inline)]

Christopher Baines <mail <at> cbaines.net> writes:

> Change the indentation to match what Emacs does.
>
> * gnu/packages/finance.scm (bitcoin-core): Change indentation of many lines.

LGTM.

[signature.asc (application/pgp-signature, inline)]

Message #20 received at 41190 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Christopher Baines <mail <at> cbaines.net>, 41190 <at> debbugs.gnu.org
Subject: Re: [bug#41190] [PATCH 1/2] gnu: finance: bitcoin-core: Reformat the
 package definition.
Date: Mon, 11 May 2020 22:10:45 +0200

[Message part 1 (text/plain, inline)]

I don't think mentioning the module in the commit header is necessary,
as it is only an implementation detail.  Referring to 'gnu: finance: '.

[signature.asc (application/pgp-signature, inline)]

Message #23 received at 41190 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 41190 <at> debbugs.gnu.org
Subject: Re: [bug#41190] [PATCH 2/2] gnu: finance: bitcoin-core: Disable a
 test that spuriously fails.
Date: Wed, 13 May 2020 19:00:01 +0100

[Message part 1 (text/plain, inline)]

Marius Bakke <mbakke <at> fastmail.com> writes:

> Christopher Baines <mail <at> cbaines.net> writes:
>
>> * gnu/packages/finance.scm (bitcoin-core)[arguments]: Disable a test.
>
> Uff, I pushed a fix for this in 46bbdef24701db8e61326b0645fd426a17111a11
> that took the upstream patch.
>
> You are too polite, asking for reviews instead of pushing straight to
> master!  :-P
>
> Sorry for the duplicate work.

No problem, at least both of us have looked at it, which is sort of like
patch review :)

[signature.asc (application/pgp-signature, inline)]

Message #28 received at 41190-done <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 41190-done <at> debbugs.gnu.org
Subject: Re: [bug#41190] [PATCH 1/2] gnu: finance: bitcoin-core: Reformat the
 package definition.
Date: Wed, 13 May 2020 19:03:08 +0100

[Message part 1 (text/plain, inline)]

Marius Bakke <mbakke <at> fastmail.com> writes:

> Christopher Baines <mail <at> cbaines.net> writes:
>
>> Change the indentation to match what Emacs does.
>>
>> * gnu/packages/finance.scm (bitcoin-core): Change indentation of many lines.
>
> LGTM.

Great, I've gone ahead and pushed this as
8ba4d8a347fbdf9fe09e8ac801b4ac0586ac382a.

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.