3 files changed, 12 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/applications/altcoins/bitcoin-abc.nix b/nixpkgs/pkgs/applications/altcoins/bitcoin-abc.nix
index 3b65b06d8db8..479d175020b7 100644
--- a/nixpkgs/pkgs/applications/altcoins/bitcoin-abc.nix
+++ b/nixpkgs/pkgs/applications/altcoins/bitcoin-abc.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version;
-  version = "0.18.2";
+  version = "0.19.4";
 
   src = fetchFromGitHub {
     owner = "bitcoin-ABC";
     repo = "bitcoin-abc";
     rev = "v${version}";
-    sha256 = "1ha219xnd61qicf7r3j0wbfrifh7blwp3lyk3ycgdn381q1qln29";
+    sha256 = "1z4x25ygcw1pqml2ww02vqrvmihlv4f5gnnn1iyfirrjxgpfaxd7";
   };
 
   patches = [ ./fix-bitcoin-qt-build.patch ];
diff --git a/nixpkgs/pkgs/applications/altcoins/bitcoin.nix b/nixpkgs/pkgs/applications/altcoins/bitcoin.nix
index b50508342bf9..d1802f774f28 100644
--- a/nixpkgs/pkgs/applications/altcoins/bitcoin.nix
+++ b/nixpkgs/pkgs/applications/altcoins/bitcoin.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost, zeromq, rapidcheck
 , zlib, miniupnpc, qtbase ? null, qttools ? null, utillinux, protobuf, python3, qrencode, libevent
 , withGui }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.17.1";
+  version = "0.18.0";
 
   src = fetchurl {
     urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
              "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz"
            ];
-    sha256 = "0am4pnaf2cisv172jqx6jdpzx770agm8777163lkjbw3ryslymiy";
+    sha256 = "5e4e6890e07b620a93fdb24605dae2bb53e8435b2a93d37558e1db1913df405f";
   };
 
-  nativeBuildInputs = [ pkgconfig autoreconfHook ]
-                   ++ optionals doCheck [ python3 ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ openssl db48 boost zlib zeromq
                   miniupnpc protobuf libevent]
                   ++ optionals stdenv.isLinux [ utillinux ]
@@ -31,11 +30,14 @@ stdenv.mkDerivation rec{
                                             "--with-qt-bindir=${qtbase.dev}/bin:${qttools.dev}/bin"
                                           ];
 
+  checkInputs = [ rapidcheck python3 ];
+
   doCheck = true;
 
   # QT_PLUGIN_PATH needs to be set when executing QT, which is needed when testing Bitcoin's GUI.
   # See also https://github.com/NixOS/nixpkgs/issues/24256
-  checkFlags = optionals withGui [ "QT_PLUGIN_PATH=${qtbase}/lib/qt-5.${versions.minor qtbase.version}/plugins" ];
+  checkFlags = optionals withGui [ "QT_PLUGIN_PATH=${qtbase}/lib/qt-5.${versions.minor qtbase.version}/plugins" ]
+    ++ [ "LC_ALL=C.UTF-8" ];
 
   enableParallelBuilding = true;
 
diff --git a/nixpkgs/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch b/nixpkgs/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
index cbbfd85fe5bf..c49bbc432519 100644
--- a/nixpkgs/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
+++ b/nixpkgs/pkgs/applications/altcoins/fix-bitcoin-qt-build.patch
@@ -4,12 +4,12 @@
  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
+-    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
+     if test "x$$1" = x && test "x$4" != xyes; then
        BITCOIN_QT_FAIL([$1 not found])
      fi