diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 425ee5c7e2f37..b9d7eeb5a888a 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, @@ -30,7 +30,7 @@ builderKeys ? [ "152812300785C96444D3334D17565732E08E5E41" # achow101.gpg "9EDAFF80E080659604F4A76B2EBB056FD847F8A7" # Emzy.gpg - # "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg (not signed 30.1) + "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg "D1DBF2C4B96F2DEBF4C16654410108112E7EA81F" # hebasto.gpg "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg "67AA5B46E7AF78053167FE343B8F814A784218F8" # willcl-ark.gpg @@ -46,14 +46,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = if withGui then "bitcoin" else "bitcoind"; - version = "30.1"; + version = "29.1"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz" ]; # hash retrieved from signed SHA256SUMS - sha256 = "5d5518782c3000f64717ec1b4291e7e609a1f900d9729ee83c982243779c3f43"; + sha256 = "067f624ae273b0d85a1554ffd7c098923351a647204e67034df6cc1dfacfa06b"; }; nativeBuildInputs = [ @@ -72,10 +72,11 @@ 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 @@ -87,18 +88,18 @@ stdenv.mkDerivation (finalAttrs: { publicKeys = fetchFromGitHub { owner = "bitcoin-core"; repo = "guix.sigs"; - rev = "8427342623f66a98e4b2503e5e15eb41485200d2"; - sha256 = "sha256-X1mA1iPAb0OE9RNP9O5rFe9rzsui+BWQ2zMcV7SghXE="; + rev = "a788388207bd244d5ab07b31ecd6c126f213a6c6"; + sha256 = "sha256-gbenuEWP6pqY9ywPd/yZy6QfWI7jvSObwto27DRXjGI="; }; checksums = fetchurl { url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS"; - hash = "sha256-WdOYSEbxmpecFpThNwxKTNXbbwQvqlUuCxmCbhfhW6k"; + hash = "sha256-teQ02vm875Isks9sBC2HV3Zo78W+UkXGH9zgyNhOnQs="; }; signatures = fetchurl { url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS.asc"; - hash = "sha256-yFPhf/tyotBtpx1lZAQR+C2YdZaAyaWCq/0OVdP2wR4="; + hash = "sha256-hyk57QyGJnrjuuGRmvfOhVAx9Nru93e8bfah5fSVcmg="; }; verifyBuilderKeys = @@ -151,6 +152,8 @@ 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 5ddb40fe1109d..a5c1e44f9337f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12414,7 +12414,7 @@ with pkgs; withGui = false; }; - bitcoin = qt6Packages.callPackage ../applications/blockchains/bitcoin { + bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin { withGui = true; inherit (darwin) autoSignDarwinBinariesHook; };