Merge bitcoin/bitcoin#35034: [31.x] Fix guix build and rc4

4a5fdb0d88 doc: update manpages for v31.0rc4 (Ava Chow)
7d56e1017d build: bump version to v31.0rc4 (Ava Chow)
2937d4ba41 guix: Restore download and build-system-cmake modules (Ava Chow)

Pull request description:

  Restoring missing guix modules required for guix building to work, and bump to rc4.

ACKs for top commit:
  davidgumberg:
    ACK 4a5fdb0d88
  hebasto:
    ACK 4a5fdb0d88, the Guix manifest has been processed for `x86_64-w64-mingw32` without errors on my machine.

Tree-SHA512: e7bbf17fc761b926fedea076b85a103e146c22d6dbad645ab087472daa78d8728dcfacf49103bb979652144da74e94e7e5878e05c9ef04b101ce96b234689ddb

CMakeLists.txt

@@ -30,7 +30,7 @@ set(CLIENT_NAME "Bitcoin Core")
 set(CLIENT_VERSION_MAJOR 31)
 set(CLIENT_VERSION_MINOR 0)
 set(CLIENT_VERSION_BUILD 0)
-set(CLIENT_VERSION_RC 3)
+set(CLIENT_VERSION_RC 4)
 set(CLIENT_VERSION_IS_RELEASE "true")
 set(COPYRIGHT_YEAR "2026")
 

contrib/guix/manifest.scm

@@ -22,9 +22,11 @@
              ((gnu packages python-xyz) #:select (python-pydantic-2))
              ((gnu packages tls) #:select (openssl))
              ((gnu packages version-control) #:select (git-minimal))
+             (guix build-system cmake)
              (guix build-system python)
              (guix build-system pyproject)
              (guix build-system trivial)
+             (guix download)
              (guix gexp)
              (guix git-download)
              ((guix licenses) #:prefix license:)

doc/man/bitcoin-cli.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-CLI "1" "April 2026" "bitcoin-cli v31.0.0rc3" "User Commands"
+.TH BITCOIN-CLI "1" "April 2026" "bitcoin-cli v31.0.0rc4" "User Commands"
 .SH NAME
-bitcoin-cli \- manual page for bitcoin-cli v31.0.0rc3
+bitcoin-cli \- manual page for bitcoin-cli v31.0.0rc4
 .SH SYNOPSIS
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,<command> \/\fR[\fI\,params\/\fR]
@@ -15,7 +15,7 @@ bitcoin-cli \- manual page for bitcoin-cli v31.0.0rc3
 .B bitcoin-cli
 [\fI\,options\/\fR] \fI\,help <command>\/\fR
 .SH DESCRIPTION
-Bitcoin Core RPC client version v31.0.0rc3
+Bitcoin Core RPC client version v31.0.0rc4
 .PP
 The bitcoin\-cli utility provides a command line interface to interact with a Bitcoin Core RPC server.
 .PP

doc/man/bitcoin-qt.1

@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-QT "1" "April 2026" "bitcoin-qt v31.0.0rc3" "User Commands"
+.TH BITCOIN-QT "1" "April 2026" "bitcoin-qt v31.0.0rc4" "User Commands"
 .SH NAME
-bitcoin-qt \- manual page for bitcoin-qt v31.0.0rc3
+bitcoin-qt \- manual page for bitcoin-qt v31.0.0rc4
 .SH SYNOPSIS
 .B bitcoin-qt
 [\fI\,options\/\fR] [\fI\,URI\/\fR]
 .SH DESCRIPTION
-Bitcoin Core version v31.0.0rc3
+Bitcoin Core version v31.0.0rc4
 .PP
 The bitcoin\-qt application provides a graphical interface for interacting with Bitcoin Core.
 .PP

doc/man/bitcoin-tx.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-TX "1" "April 2026" "bitcoin-tx v31.0.0rc3" "User Commands"
+.TH BITCOIN-TX "1" "April 2026" "bitcoin-tx v31.0.0rc4" "User Commands"
 .SH NAME
-bitcoin-tx \- manual page for bitcoin-tx v31.0.0rc3
+bitcoin-tx \- manual page for bitcoin-tx v31.0.0rc4
 .SH SYNOPSIS
 .B bitcoin-tx
 [\fI\,options\/\fR] \fI\,<hex-tx> \/\fR[\fI\,commands\/\fR]
@@ -9,7 +9,7 @@ bitcoin-tx \- manual page for bitcoin-tx v31.0.0rc3
 .B bitcoin-tx
 [\fI\,options\/\fR] \fI\,-create \/\fR[\fI\,commands\/\fR]
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-tx utility version v31.0.0rc3
+Bitcoin Core bitcoin\-tx utility version v31.0.0rc4
 .PP
 The bitcoin\-tx tool is used for creating and modifying bitcoin transactions.
 .PP

doc/man/bitcoin-util.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-UTIL "1" "April 2026" "bitcoin-util v31.0.0rc3" "User Commands"
+.TH BITCOIN-UTIL "1" "April 2026" "bitcoin-util v31.0.0rc4" "User Commands"
 .SH NAME
-bitcoin-util \- manual page for bitcoin-util v31.0.0rc3
+bitcoin-util \- manual page for bitcoin-util v31.0.0rc4
 .SH SYNOPSIS
 .B bitcoin-util
 [\fI\,options\/\fR] [\fI\,command\/\fR]
@@ -9,7 +9,7 @@ bitcoin-util \- manual page for bitcoin-util v31.0.0rc3
 .B bitcoin-util
 [\fI\,options\/\fR] \fI\,grind <hex-block-header>\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-util utility version v31.0.0rc3
+Bitcoin Core bitcoin\-util utility version v31.0.0rc4
 .PP
 The bitcoin\-util tool provides bitcoin related functionality that does not rely on the ability to access a running node. Available [commands] are listed below.
 .SH OPTIONS

doc/man/bitcoin-wallet.1

@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN-WALLET "1" "April 2026" "bitcoin-wallet v31.0.0rc3" "User Commands"
+.TH BITCOIN-WALLET "1" "April 2026" "bitcoin-wallet v31.0.0rc4" "User Commands"
 .SH NAME
-bitcoin-wallet \- manual page for bitcoin-wallet v31.0.0rc3
+bitcoin-wallet \- manual page for bitcoin-wallet v31.0.0rc4
 .SH SYNOPSIS
 .B bitcoin-wallet
 [\fI\,options\/\fR] \fI\,<command>\/\fR
 .SH DESCRIPTION
-Bitcoin Core bitcoin\-wallet utility version v31.0.0rc3
+Bitcoin Core bitcoin\-wallet utility version v31.0.0rc4
 .PP
 bitcoin\-wallet is an offline tool for creating and interacting with Bitcoin Core wallet files.
 .PP

doc/man/bitcoin.1

@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIN "1" "April 2026" "bitcoin v31.0.0rc3" "User Commands"
+.TH BITCOIN "1" "April 2026" "bitcoin v31.0.0rc4" "User Commands"
 .SH NAME
-bitcoin \- manual page for bitcoin v31.0.0rc3
+bitcoin \- manual page for bitcoin v31.0.0rc4
 .SH SYNOPSIS
 .B bitcoin
 [\fI\,OPTIONS\/\fR] \fI\,COMMAND\/\fR...

doc/man/bitcoind.1

@@ -1,12 +1,12 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH BITCOIND "1" "April 2026" "bitcoind v31.0.0rc3" "User Commands"
+.TH BITCOIND "1" "April 2026" "bitcoind v31.0.0rc4" "User Commands"
 .SH NAME
-bitcoind \- manual page for bitcoind v31.0.0rc3
+bitcoind \- manual page for bitcoind v31.0.0rc4
 .SH SYNOPSIS
 .B bitcoind
 [\fI\,options\/\fR]
 .SH DESCRIPTION
-Bitcoin Core daemon version v31.0.0rc3 bitcoind
+Bitcoin Core daemon version v31.0.0rc4 bitcoind
 .PP
 The Bitcoin Core daemon (bitcoind) is a headless program that connects to the Bitcoin network to validate and relay transactions and blocks, as well as relaying addresses.
 .PP