From b8758c3592598dbd7acefc495c4cf31e510d7be3 Mon Sep 17 00:00:00 2001 From: 0xb10c Date: Mon, 22 Sep 2025 09:37:47 +0200 Subject: [PATCH] bitcoind: 29.1 -> 30.0 https://groups.google.com/g/bitcoindev/c/44rT5evWVxI - `db48` is dropped as "legacy" wallet support using db48 has been removed - `capnnproto` is added for the multiprocess functionallity - `libsForQt5` -> `qt6Packages` as the GUI is now using Qt6 --- pkgs/applications/blockchains/bitcoin/default.nix | 15 ++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 2a1b52daceb7..a2a9889007a0 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -12,10 +12,10 @@ libevent, zeromq, zlib, - db48, sqlite, qrencode, libsystemtap, + capnproto, qtbase ? null, qttools ? null, python3, @@ -45,14 +45,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = if withGui then "bitcoin" else "bitcoind"; - version = "29.1"; + version = "30.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "067f624ae273b0d85a1554ffd7c098923351a647204e67034df6cc1dfacfa06b"; + sha256 = "9b472a4d51dfed9aa9d0ded2cb8c7bcb9267f8439a23a98f36eb509c1a5e6974"; }; nativeBuildInputs = [ @@ -71,11 +71,10 @@ stdenv.mkDerivation (finalAttrs: { libevent zeromq zlib + capnproto ] ++ lib.optionals enableTracing [ libsystemtap ] ++ lib.optionals withWallet [ sqlite ] - # building with db48 (for legacy descriptor wallet support) is broken on Darwin - ++ lib.optionals (withWallet && !stdenv.hostPlatform.isDarwin) [ db48 ] ++ lib.optionals withGui [ qrencode qtbase @@ -93,12 +92,12 @@ stdenv.mkDerivation (finalAttrs: { checksums = fetchurl { url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS"; - hash = "sha256-teQ02vm875Isks9sBC2HV3Zo78W+UkXGH9zgyNhOnQs="; + hash = "sha256-v/b1wTOreKifpWkIrUEJsGaSo7LFs4pn7YgBN88dO9o="; }; signatures = fetchurl { url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS.asc"; - hash = "sha256-hyk57QyGJnrjuuGRmvfOhVAx9Nru93e8bfah5fSVcmg="; + hash = "sha256-MK37HyHAqp/vWLjKm/3HF0LkTXtKQwqz6cL4hY2YUPU="; }; verifyBuilderKeys = @@ -151,8 +150,6 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_BENCH" false) (lib.cmakeBool "WITH_ZMQ" true) - # building with db48 (for legacy wallet support) is broken on Darwin - (lib.cmakeBool "WITH_BDB" (withWallet && !stdenv.hostPlatform.isDarwin)) (lib.cmakeBool "WITH_USDT" enableTracing) ] ++ lib.optionals (!finalAttrs.doCheck) [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4396829efcb..e1d6effc221a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13500,7 +13500,7 @@ with pkgs; withGui = false; }; - bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { + bitcoin = qt6Packages.callPackage ../applications/blockchains/bitcoin { withGui = true; inherit (darwin) autoSignDarwinBinariesHook; };