jacobpascual/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge fort-nix/nix-bitcoin#661: update nixpkgs

Browse Source 
457f066e08 tests/trustedcoin: fix (Erik Arvstedt)
f06ee98435 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 457f066e08

Tree-SHA512: 7c1529dd8830187c0ee9adfb585747fc41300dc7efe1b8a3304ee6b5903034d8296eccecc744d38b7333a06e4f2c201dbe33d000d8360e030d1e2d16879f9513
This commit is contained in:
Jonas Nick
2023-11-29 09:27:44 +00:00
parent 24151b63f8 457f066e08
commit 1d73b21f10
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock generated
View File

@@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691100095, "lastModified": 1699821751,
"narHash": "sha256-qp+M5l18qHRmvUkYOqoi5AaspX7ZbqsVf6S8qQgEnFs=", "narHash": "sha256-UlId5jvJFmkVcKpn0oZ2VTvWAc/mZy6butRZGk73xXM=",
"owner": "erikarvstedt", "owner": "erikarvstedt",
"repo": "extra-container", "repo": "extra-container",
"rev": "9a594f75cc782c481df9d108624409d429a23f19", "rev": "842912907bf189ef17a80ca09ba37b6bdfc76c49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -43,11 +43,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1697851979, "lastModified": 1701053011,
"narHash": "sha256-lJ8k4qkkwdvi+t/Xc6Fn74kUuobpu9ynPGxNZR6OwoA=", "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5550a85a087c04ddcace7f892b0bdc9d8bb080c8", "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -59,11 +59,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1697915759, "lastModified": 1701040486,
"narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", "narHash": "sha256-vawYwoHA5CwvjfqaT3A5CT9V36Eq43gxdwpux32Qkjw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", "rev": "45827faa2132b8eade424f6bdd48d8828754341a",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
pkgs/pinned.nix
View File

@@ -5,7 +5,6 @@ pkgs: pkgsUnstable:
bitcoin bitcoin
bitcoind bitcoind
charge-lnd charge-lnd
electrs
elementsd elementsd
extra-container extra-container
lndconnect; lndconnect;
@@ -13,6 +12,7 @@ pkgs: pkgsUnstable:
inherit (pkgsUnstable) inherit (pkgsUnstable)
btcpayserver btcpayserver
clightning clightning
electrs
fulcrum fulcrum
hwi hwi
lightning-loop lightning-loop

3
test/tests.py
View File

@@ -451,8 +451,7 @@ def _():
expect_clightning_log("plugin-trustedcoin[^^]\[0m\s+estimatefees error: none of the esploras returned usable responses") expect_clightning_log("plugin-trustedcoin[^^]\[0m\s+estimatefees error: none of the esploras returned usable responses")
if "regtest" in enabled_tests: if "regtest" in enabled_tests:
num_blocks = test_data["num_blocks"] num_blocks = test_data["num_blocks"]
expect_clightning_log(f"plugin-trustedcoin[^^]\[0m\s+tip: {num_blocks}") expect_clightning_log(f"plugin-trustedcoin[^^]\[0m\s+returning block {num_blocks}")
expect_clightning_log("plugin-trustedcoin[^^]\[0m\s+returning block")
if "netns-isolation" in enabled_tests: if "netns-isolation" in enabled_tests: