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

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

Browse source 
b9019d170d test: remove clightning TODO-EXTERNAL requiring to disable offers (Jonas Nick)
7fb481cf58 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK b9019d170d

Tree-SHA512: 0f18de71c4f98e29ccccc9150c8138fcaf860f6e7813ec9ee6ed76efec2340c35edfdbe75f0b6bb59b4fe407f0e1f9579ed5cda6f970bfb66625398f5a80161f
This commit is contained in:
Jonas Nick 2024-12-02 20:43:51 +00:00
commit ff847d527c
No known key found for this signature in database
GPG key ID: 4861DBF262123605
10 changed files with 22 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/deploy-container-minimal.sh
View file

@ -21,12 +21,8 @@ cat > "$tmpDir/configuration.nix" <<EOF
password = "a";
};
# When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
disable-dns
disable-plugin=offers
'';
}
EOF

7
examples/deploy-container.sh
View file

@ -83,13 +83,6 @@ read -rd '' src <<EOF || true
$(realpath "$configuration")
];
nix-bitcoin.generateSecrets = true;
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
disable-plugin=offers
'';
};
};
}

7
examples/deploy-qemu-vm.sh
View file

@ -30,13 +30,6 @@ nix-build --out-link "$tmpDir/vm" - <<'EOF'
<qemu-vm/vm-config.nix>
];
nix-bitcoin.generateSecrets = true;
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
disable-plugin=offers
'';
};
}).config.system.build.vm
EOF

7
examples/krops-vm-configuration.nix
View file

@ -4,11 +4,4 @@
<nix-bitcoin/modules/deployment/krops.nix>
<qemu-vm/vm-config.nix>
];
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
disable-plugin=offers
'';
}

4
examples/qemu-vm/minimal-vm.nix
View file

@ -27,12 +27,8 @@ rec {
nix-bitcoin.generateSecrets = true;
services.clightning.enable = true;
# disable-dns leads to faster startup in offline VMs
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
disable-dns
disable-plugin=offers
'';
# Avoid lengthy build of the nixos manual

18
flake.lock generated
View file

@ -28,11 +28,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@ -43,11 +43,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1730137625,
"narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
"lastModified": 1732749044,
"narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
"rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
"type": "github"
},
"original": {
@ -59,11 +59,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1730170245,
"narHash": "sha256-PRq4vJjDa+m1mNwkV9H7zVzMhuMqsHJrTGx0iJZ0e0w=",
"lastModified": 1732997066,
"narHash": "sha256-9Vvu3a1ep1LB6F/kVE2hHH2HQzhSFtUyJYiJRkUkC4Q=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "30c9efeef01e2ad4880bff6a01a61dd99536b3c9",
"rev": "33b9d57c656e65a9c88c5f34e4eb00b83e2b0ca9",
"type": "github"
},
"original": {

2
pkgs/pinned.nix
View file

@ -5,7 +5,6 @@ pkgs: pkgsUnstable:
charge-lnd
elementsd
extra-container
lightning-loop
lightning-pool
lndconnect;
@ -18,6 +17,7 @@ pkgs: pkgsUnstable:
electrs
fulcrum
hwi
lightning-loop
lnd
nbxplorer;

4
test/clightning-replication.nix
View file

@ -24,12 +24,8 @@ let
# TODO-EXTERNAL:
# When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
extraConfig = ''
disable-dns
disable-plugin=offers
'';
};
};

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

@ -5,11 +5,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
@ -21,11 +21,11 @@
"nixos-infra": {
"flake": false,
"locked": {
"lastModified": 1729889784,
"narHash": "sha256-xlauiZTSuG0u7HaEZGsvGYr21hiDVyE8dJGgNNACMAw=",
"lastModified": 1732983965,
"narHash": "sha256-F3aFC/sdVvch7rRTBMfYo2fSdt6az+nzc1d1NUlN6dE=",
"owner": "NixOS",
"repo": "infra",
"rev": "e89dac731911c342179295a90c8095928a404f32",
"rev": "b312050edc40c388c8218aaa28bb390ba8c3373f",
"type": "github"
},
"original": {
@ -43,11 +43,11 @@
"npmlock2nix": "npmlock2nix"
},
"locked": {
"lastModified": 1730051716,
"narHash": "sha256-3dQLrg5/cQJ5Xs8TW6wwtxLaETRHA/q41zOO5yirfC0=",
"lastModified": 1733014289,
"narHash": "sha256-hgMG4ndkArZYCWu4OPkDKfvYz48pHpWs3jw6y7arlIg=",
"owner": "nixos",
"repo": "nixos-search",
"rev": "bc0aa355ea460461c6e2f99c8df7c6550e8d936f",
"rev": "89daae878ab3d860802322aa9366ba5b0cf7fa45",
"type": "github"
},
"original": {
@ -58,11 +58,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1729665710,
"narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
"lastModified": 1732837521,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
"type": "github"
},
"original": {

4
test/tests.nix
View file

@ -43,12 +43,8 @@ let
# TODO-EXTERNAL:
# When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
# TODO-EXTERNAL:
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
services.clightning.extraConfig = ''
${optionalString config.test.noConnections "disable-dns"}
disable-plugin=offers
'';
test.data.clightning-plugins = let
plugins = config.services.clightning.plugins;