Merge #656: update nixpkgs: bitcoin 24.1 -> 25.1

a66c999 tests/trustedcoin: fix test (Erik Arvstedt)
8e2010c update nixpkgs (Jonas Nick)
2804d4a Revert "bitcoin: replace nixpkgs package with bitcoin{,d} 24.1" (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK a66c999

Tree-SHA512: 6a30a86d64ad1a178ab091f3300291d711cedacd35b056f91f26b9976b83f556a1f7872a32f74c3fd545396f303b4475b9a16dd9c3043914586c5ac615519d59

pkgs/default.nix

@@ -10,19 +10,6 @@ in
   }
 }:
 let self = {
-  # TODO-EXTERNAL:
-  # Remove bitcoin and bitcoind 24.1 packages and replace with 25.0 from nixpkgs
-  # when https://github.com/bitcoin/bitcoin/issues/27722 has been resolved
-  bitcoin  = pkgs.libsForQt5.callPackage ./bitcoin {
-    stdenv = if pkgs.stdenv.isDarwin then pkgs.darwin.apple_sdk_11_0.stdenv else pkgs.stdenv;
-    withGui = true;
-    inherit (pkgs.darwin) autoSignDarwinBinariesHook;
-  };
-
-  bitcoind = pkgs.callPackage ./bitcoin {
-    withGui = false;
-    inherit (pkgs.darwin) autoSignDarwinBinariesHook;
-  };
   clightning-rest = pkgs.callPackage ./clightning-rest { inherit (self) fetchNodeModules; };
   clboss = pkgs.callPackage ./clboss { };
   clightning-plugins = pkgs.recurseIntoAttrs (import ./clightning-plugins pkgs self.nbPython3Packages);

pkgs/pinned.nix

@@ -2,6 +2,8 @@
 pkgs: pkgsUnstable:
 {
   inherit (pkgs)
+    bitcoin
+    bitcoind
     charge-lnd
     electrs
     elementsd

test/tests.py

@@ -432,7 +432,6 @@ def _():
     def expect_clightning_log(str):
         machine.wait_until_succeeds(log_has_string("clightning", str))
 
-    machine.wait_for_unit("clightning")
     expect_clightning_log("plugin-trustedcoin[^^]\[0m\s+bitcoind RPC working")
     expect_clightning_log("plugin-trustedcoin[^^]\[0m\s+estimatefees error: none of the esploras returned usable responses")
     if "regtest" in enabled_tests: