Unverified Commit abedc8e2 authored by Pavol Rusnak's avatar Pavol Rusnak Committed by GitHub
Browse files

bitcoind: 29.1 -> 30.0 (#451606)

parents 099f05df b8758c35

pkgs/applications/blockchains/bitcoin/default.nix

+6 −9
Original line number Diff line number Diff line
@@ -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) [

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -13135,7 +13135,7 @@ with pkgs; 
    withGui = false;

  };



  bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {

  bitcoin = qt6Packages.callPackage ../applications/blockchains/bitcoin {

    withGui = true;

    inherit (darwin) autoSignDarwinBinariesHook;

  };