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

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

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 280 bytes --]


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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

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

[Christopher Baines]

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

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

[Christopher Baines]

* 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

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

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

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

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 490 bytes --]


Marius Bakke <mbakke@fastmail.com> writes:

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

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

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 186 bytes --]

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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

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

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]


Marius Bakke <mbakke@fastmail.com> writes:

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

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

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 143 bytes --]

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]