From b206c7d019517276f22761b515509382d139499b Mon Sep 17 00:00:00 2001
From: witheredsea7df <witheredsea7df@proton.me>
Date: Sat, 8 Oct 2022 15:34:45 -0400
Subject: bitcoin-abc: 0.21.13 -> 0.26.2

---
 pkgs/applications/blockchains/bitcoin-abc/default.nix     |  8 ++++----
 .../blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch    | 15 ---------------
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch

(limited to 'pkgs/applications/blockchains')

diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix
index 6f1734bbc1359..c1ede1ea839f6 100644
--- a/pkgs/applications/blockchains/bitcoin-abc/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix
@@ -15,6 +15,7 @@
 , protobuf
 , qrencode
 , libevent
+, sqlite
 , withGui
 , python3
 , jemalloc
@@ -23,17 +24,15 @@
 
 mkDerivation rec {
   pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc";
-  version = "0.21.13";
+  version = "0.26.2";
 
   src = fetchFromGitHub {
     owner = "bitcoin-ABC";
     repo = "bitcoin-abc";
     rev = "v${version}";
-    sha256 = "1x8xcdi1vcskggk9bqkwr3ah4vi9b7sj2h8hf7spac6dvz8lmzav";
+    sha256 = "0gz4713lk3alk3ykwq1bdqjywadrfrnb7n2878136g01n87j00az";
   };
 
-  patches = [ ./fix-bitcoin-qt-build.patch ];
-
   nativeBuildInputs = [ pkg-config cmake ];
   buildInputs = [
     openssl
@@ -47,6 +46,7 @@ mkDerivation rec {
     util-linux
     protobuf
     libevent
+    sqlite
   ] ++ lib.optionals withGui [ qtbase qttools qrencode ];
 
   cmakeFlags = lib.optionals (!withGui) [
diff --git a/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch b/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch
deleted file mode 100644
index c49bbc4325192..0000000000000
--- a/pkgs/applications/blockchains/bitcoin-abc/fix-bitcoin-qt-build.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- bitcoin-abc-v0.15.0-src/build-aux/m4/bitcoin_qt.m4	1970-01-01 01:00:01.000000000 +0100
-+++ bitcoin-abc-v0.15.0-src.org/build-aux/m4/bitcoin_qt.m4	2017-09-27 23:38:44.748384197 +0100
-@@ -35,11 +35,7 @@
- dnl Output: $1 is set to the path of $2 if found. $2 are searched in order.
- AC_DEFUN([BITCOIN_QT_PATH_PROGS],[
-   BITCOIN_QT_CHECK([
--    if test "x$3" != x; then
--      AC_PATH_PROGS($1,$2,,$3)
--    else
--      AC_PATH_PROGS($1,$2)
--    fi
-+    AC_PATH_PROGS($1,$2)
-     if test "x$$1" = x && test "x$4" != xyes; then
-       BITCOIN_QT_FAIL([$1 not found])
-     fi
-- 
cgit 1.4.1