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

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

Browse source 
2f986c80e5 update nixpkgs (Jonas Nick)
76ea066809 trustedcoin: 0.8.2 -> 2024-11-15 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 2f986c80e5

Tree-SHA512: 2824fc5f2c0f5586d1912c237a0b129387a913283d70840c6c4020e168bf924814b335796e863a64b97f6d60aced0e65fd10561fb3c1d4a33542dc235df46d25
This commit is contained in:
Jonas Nick 2024-11-16 14:57:39 +00:00
commit c0994bfc7b
No known key found for this signature in database
GPG key ID: 4861DBF262123605
6 changed files with 33 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -43,11 +43,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728193676, "lastModified": 1730137625,
"narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,11 +59,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1728279793, "lastModified": 1730170245,
"narHash": "sha256-W3D5YpNrUVTFPVU4jiEiboaaUDShaiH5fRl9aJLqUnU=", "narHash": "sha256-PRq4vJjDa+m1mNwkV9H7zVzMhuMqsHJrTGx0iJZ0e0w=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f85a2d005e83542784a755ca8da112f4f65c4aa4", "rev": "30c9efeef01e2ad4880bff6a01a61dd99536b3c9",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
modules/lnd.nix
View file

@ -211,6 +211,12 @@ in {
zmqpubrawblock = mkDefault "tcp://${bitcoindRpcAddress}:28332"; zmqpubrawblock = mkDefault "tcp://${bitcoindRpcAddress}:28332";
zmqpubrawtx = mkDefault "tcp://${bitcoindRpcAddress}:28333"; zmqpubrawtx = mkDefault "tcp://${bitcoindRpcAddress}:28333";
# TODO-EXTERNAL: remove when https://github.com/lightningnetwork/lnd/issues/9163
# has been fixed.
extraConfig = ''
deprecatedrpc=warnings
'';
}; };
environment.systemPackages = [ cfg.package (hiPrio cfg.cli) ]; environment.systemPackages = [ cfg.package (hiPrio cfg.cli) ];

4
pkgs/pinned.nix
View file

@ -2,8 +2,6 @@
pkgs: pkgsUnstable: pkgs: pkgsUnstable:
{ {
inherit (pkgs) inherit (pkgs)
bitcoin
bitcoind
charge-lnd charge-lnd
elementsd elementsd
extra-container extra-container
@ -12,6 +10,8 @@ pkgs: pkgsUnstable:
lndconnect; lndconnect;
inherit (pkgsUnstable) inherit (pkgsUnstable)
bitcoin
bitcoind
btcpayserver btcpayserver
clboss clboss
clightning clightning

16
pkgs/trustedcoin/default.nix
View file

@ -1,20 +1,24 @@
{ lib, buildGoModule, fetchFromGitHub }: { lib, buildGo123Module, fetchFromGitHub }:
buildGoModule rec { buildGo123Module rec {
pname = "trustedcoin"; pname = "trustedcoin";
version = "0.8.2"; version = "2024-11-15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nbd-wtf"; owner = "nbd-wtf";
repo = pname; repo = pname;
rev = "v${version}"; rev = "92e6f2129f85548693b4a44b39eab9e5ade8c23d";
hash = "sha256-M1z5Vn3UGLJHdCZxud8jM2ewiW90zzC7Vaidv3yGNAE="; hash = "sha256-Blw2s0JECe01s3Wn6gY3Ladd81+wWBBeXarICa0l/bU=";
}; };
vendorHash = "sha256-hKaSB8/pymA7o2LuUpLjLZYn37JzEBn3a/3vkGbhLdM="; vendorHash = "sha256-fW+EoNPC0mH8C06Q6GXNwFdzE7oQT+qd+B7hGGml+hc=";
subPackages = [ "." ]; subPackages = [ "." ];
preCheck = ''
ln -s $TMP/go/bin/trustedcoin .
'';
meta = with lib; { meta = with lib; {
description = "Light bitcoin node implementation"; description = "Light bitcoin node implementation";
homepage = "https://github.com/nbd-wtf/trustedcoin"; homepage = "https://github.com/nbd-wtf/trustedcoin";

18
test/nixos-search/flake.lock generated
View file

@ -21,11 +21,11 @@
"nixos-infra": { "nixos-infra": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1727984934, "lastModified": 1729889784,
"narHash": "sha256-6+6qpApRNuBTIoioP7FWRCRCM/Ew/DZ3Sl1z/6K6VgY=", "narHash": "sha256-xlauiZTSuG0u7HaEZGsvGYr21hiDVyE8dJGgNNACMAw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "infra", "repo": "infra",
"rev": "8be4953d68ce81455787cd60e82086022855a3c2", "rev": "e89dac731911c342179295a90c8095928a404f32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -43,11 +43,11 @@
"npmlock2nix": "npmlock2nix" "npmlock2nix": "npmlock2nix"
}, },
"locked": { "locked": {
"lastModified": 1728300736, "lastModified": 1730051716,
"narHash": "sha256-bZJLu5HP36ar6CVUJ7mzMh8hpt3QGqL+aBkwAPtBU3w=", "narHash": "sha256-3dQLrg5/cQJ5Xs8TW6wwtxLaETRHA/q41zOO5yirfC0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-search", "repo": "nixos-search",
"rev": "9f3a9703b8433cbe19a941cfcd32e503515b50a2", "rev": "bc0aa355ea460461c6e2f99c8df7c6550e8d936f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1728018373, "lastModified": 1729665710,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
test/tests.py
View file

@ -448,7 +448,6 @@ def _():
machine.wait_until_succeeds(log_has_string("clightning", str)) machine.wait_until_succeeds(log_has_string("clightning", str))
expect_clightning_log("plugin-trustedcoin[^^]\[0m\s+bitcoind RPC working") 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: 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+returning block {num_blocks}") expect_clightning_log(f"plugin-trustedcoin[^^]\[0m\s+returning block {num_blocks}")