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

bitcoin: 30.2 -> 31.0 (#511775)

parents d5eb4f6b 8a06b641

pkgs/applications/blockchains/bitcoin/default.nix

+7 −7
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ 
  builderKeys ? [

    "152812300785C96444D3334D17565732E08E5E41" # achow101.gpg

    "9EDAFF80E080659604F4A76B2EBB056FD847F8A7" # Emzy.gpg

    # "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg (not signed 30.2)

    # "6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C" # glozow.gpg (not signed 31.0)

    "D1DBF2C4B96F2DEBF4C16654410108112E7EA81F" # hebasto.gpg

    # "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg (not signed 30.2)

    # "67AA5B46E7AF78053167FE343B8F814A784218F8" # willcl-ark.gpg (not signed 30.2)

    # "71A3B16735405025D447E8F274810B012346C9A6" # laanwj.gpg (not signed 31.0)

    "67AA5B46E7AF78053167FE343B8F814A784218F8"

  ],

}:
@@ -46,14 +46,14 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = if withGui then "bitcoin" else "bitcoind";

  version = "30.2";

  version = "31.0";



  src = fetchurl {

    urls = [

      "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/bitcoin-${finalAttrs.version}.tar.gz"

    ];

    # hash retrieved from signed SHA256SUMS

    sha256 = "6fd00b8c42883d5c963901ad4109a35be1e5ec5c2dc763018c166c21a06c84cb";

    sha256 = "0ba0ef5eea3aefd96cc1774be274c3d594812cfac0988809d706738bb067b3e3";

  };



  nativeBuildInputs = [
@@ -93,12 +93,12 @@ stdenv.mkDerivation (finalAttrs: { 


      checksums = fetchurl {

        url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS";

        hash = "sha256-ERE/QO2elj++mON3UYGJKaLdU86gWIRS/AufuyS/JAU=";

        hash = "sha256-w/4sIOBYR1d/YzzMqwzH6wRHOPQnNg8x7yS96+eWk8g=";

      };



      signatures = fetchurl {

        url = "https://bitcoincore.org/bin/bitcoin-core-${finalAttrs.version}/SHA256SUMS.asc";

        hash = "sha256-69TMNzKJQRDC+2YU6bKI23c8Jx44m5B1zz823SQtiyg=";

        hash = "sha256-hkztGd2fUel7JJbe9RGSfJXGozhb085XvmqPjks96l4=";

      };



      verifyBuilderKeys =

pkgs/top-level/all-packages.nix

+0 −3
Original line number Diff line number Diff line
@@ -10898,9 +10898,6 @@ with pkgs; 


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

    withGui = true;

    sqlite = sqlite.override {

      zlib = null;

    };

    zeromq = zeromq.override {

      enableCurve = false;

      enableDrafts = false;