From 193e6decd7a92dcf3a880f7bb9fcde8d45e36202 Mon Sep 17 00:00:00 2001
From: 0xB10C <b10c@b10c.me>
Date: Tue, 21 Apr 2026 16:02:24 +0200
Subject: [PATCH 1/2] Revert "bitcoin: Remove zlib transistive dependency from
 bitcoin"

This reverts commit 57b26dec73a9f26c301322e4ceec0618a51994aa as it broke
the bitcoind build. See

- https://github.com/NixOS/nixpkgs/pull/474827#issuecomment-4287223019
- https://github.com/NixOS/nixpkgs/pull/511775#issuecomment-4287233678
---
 pkgs/top-level/all-packages.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f70b152c560..ec5ec919fe8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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;

From 8a06b6413e7480ca9d79dca3439ab3632e102614 Mon Sep 17 00:00:00 2001
From: 0xb10c <b10c@b10c.me>
Date: Mon, 20 Apr 2026 16:29:55 +0200
Subject: [PATCH 2/2] bitcoin: 30.2 -> 31.0

https://bitcoincore.org/en/releases/31.0/
---
 pkgs/applications/blockchains/bitcoin/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index 858f21320109..5f49d28d97b8 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -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 =