[PATCH 0/2] Fix bitcoin-core build.

Christopher Baines wrote on 11 May 2020 20:05

Recipients:(address . guix-patches@gnu.org)

Message-ID:87h7wmpcsk.fsf@cbaines.net

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(-)

Christopher Baines wrote on 11 May 2020 20:16

[PATCH 2/2] gnu: finance: bitcoin-core: Disable a test that spuriously fails.

Recipients:(address . 41190@debbugs.gnu.org)

Message-ID:20200511181656.25849-2-mail@cbaines.net

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

---

gnu/packages/finance.scm | 4 ++++

1 file changed, 4 insertions(+)

Toggle diff (17 lines)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

Christopher Baines wrote on 11 May 2020 20:16

[PATCH 1/2] gnu: finance: bitcoin-core: Reformat the package definition.

Recipients:(address . 41190@debbugs.gnu.org)

Message-ID:20200511181656.25849-1-mail@cbaines.net

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(-)

Toggle diff (89 lines)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

Marius Bakke wrote on 11 May 2020 22:08

Re: [bug#41190] [PATCH 2/2] gnu: finance: bitcoin-core: Disable a test that spuriously fails.

Recipients:

Message-ID:878shyw7yt.fsf@devup.no

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (2 lines)

> * 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.

Marius Bakke wrote on 11 May 2020 22:08

Re: [bug#41190] [PATCH 1/2] gnu: finance: bitcoin-core: Reformat the package definition.

Recipients:

Message-ID:875zd2w7xo.fsf@devup.no

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (4 lines)

> Change the indentation to match what Emacs does.

> * gnu/packages/finance.scm (bitcoin-core): Change indentation of many lines.

LGTM.

Marius Bakke wrote on 11 May 2020 22:10

Recipients:

Message-ID:873686w7ui.fsf@devup.no

I don't think mentioning the module in the commit header is necessary,

as it is only an implementation detail. Referring to 'gnu: finance: '.

Christopher Baines wrote on 13 May 2020 20:00

Re: [bug#41190] [PATCH 2/2] gnu: finance: bitcoin-core: Disable a test that spuriously fails.

Recipients:(name . Marius Bakke)(address . mbakke@fastmail.com)(address . 41190@debbugs.gnu.org)

Message-ID:87o8qrogv2.fsf@cbaines.net

Marius Bakke <mbakke@fastmail.com> writes:

Toggle quote (12 lines)> Christopher Baines <mail@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 :)

Christopher Baines wrote on 13 May 2020 20:03

Re: [bug#41190] [PATCH 1/2] gnu: finance: bitcoin-core: Reformat the package definition.

Recipients:(name . Marius Bakke)(address . mbakke@fastmail.com)(address . 41190-done@debbugs.gnu.org)

Message-ID:87mu6bogpv.fsf@cbaines.net

Marius Bakke <mbakke@fastmail.com> writes:

Toggle quote (8 lines)

> Christopher Baines <mail@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.

Closed

Your comment

This issue is archived.

To comment on this conversation send email to 41190@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date