Skip to content

Commit 652b67e

Browse files
committed
Merge #711: update nixpkgs
b26cea0 update nixpkgs (Jonas Nick) Pull request description: ACKs for top commit: erikarvstedt: ACK b26cea0 Tree-SHA512: 1c947307f0e89c89b931ee2c66675544a0fd37d878bf80acc940bdd023d2f0576b0b02a098ed36fe93bb334b877027f22077e3039fe8a609c2230a53e860fd17
2 parents efd8ea7 + b26cea0 commit 652b67e

File tree

10 files changed

+88
-21
lines changed

10 files changed

+88
-21
lines changed

examples/deploy-container-minimal.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@ cat > "$tmpDir/configuration.nix" <<EOF
2121
password = "a";
2222
};
2323
# When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s
24-
services.clightning.extraConfig = "disable-dns";
24+
# TODO-EXTERNAL:
25+
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
26+
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
27+
services.clightning.extraConfig = ''
28+
disable-dns
29+
disable-plugin=offers
30+
'';
2531
}
2632
EOF
2733

examples/deploy-container.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ read -rd '' src <<EOF || true
8383
$(realpath "$configuration")
8484
];
8585
nix-bitcoin.generateSecrets = true;
86+
87+
# TODO-EXTERNAL:
88+
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
89+
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
90+
services.clightning.extraConfig = ''
91+
disable-plugin=offers
92+
'';
8693
};
8794
};
8895
}

examples/deploy-qemu-vm.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,13 @@ nix-build --out-link "$tmpDir/vm" - <<'EOF'
3030
<qemu-vm/vm-config.nix>
3131
];
3232
nix-bitcoin.generateSecrets = true;
33+
34+
# TODO-EXTERNAL:
35+
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
36+
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
37+
services.clightning.extraConfig = ''
38+
disable-plugin=offers
39+
'';
3340
};
3441
}).config.system.build.vm
3542
EOF

examples/krops-vm-configuration.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,11 @@
44
<nix-bitcoin/modules/deployment/krops.nix>
55
<qemu-vm/vm-config.nix>
66
];
7+
8+
# TODO-EXTERNAL:
9+
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
10+
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
11+
services.clightning.extraConfig = ''
12+
disable-plugin=offers
13+
'';
714
}

examples/qemu-vm/minimal-vm.nix

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,14 @@ rec {
2626

2727
nix-bitcoin.generateSecrets = true;
2828
services.clightning.enable = true;
29-
# For faster startup in offline VMs
30-
services.clightning.extraConfig = "disable-dns";
29+
# disable-dns leads to faster startup in offline VMs
30+
# TODO-EXTERNAL:
31+
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
32+
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
33+
services.clightning.extraConfig = ''
34+
disable-dns
35+
disable-plugin=offers
36+
'';
3137

3238
# Avoid lengthy build of the nixos manual
3339
documentation.nixos.enable = false;

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/clightning-replication.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ let
2424

2525
# TODO-EXTERNAL:
2626
# When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
27-
extraConfig = "disable-dns";
27+
# TODO-EXTERNAL:
28+
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
29+
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
30+
extraConfig = ''
31+
disable-dns
32+
disable-plugin=offers
33+
'';
2834
};
2935
};
3036
in

test/nixos-search/flake.lock

Lines changed: 25 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test/tests.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ let
4343

4444
# TODO-EXTERNAL:
4545
# When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
46-
services.clightning.extraConfig = mkIf config.test.noConnections "disable-dns";
46+
# TODO-EXTERNAL:
47+
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
48+
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
49+
services.clightning.extraConfig = ''
50+
${optionalString config.test.noConnections "disable-dns"}
51+
disable-plugin=offers
52+
'';
4753
test.data.clightning-plugins = let
4854
plugins = config.services.clightning.plugins;
4955
removed = [

test/wireguard-lndconnect.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@ makeTestVM {
2424
};
2525
# TODO-EXTERNAL:
2626
# When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
27-
services.clightning.extraConfig = "disable-dns";
27+
# TODO-EXTERNAL:
28+
# When bitcoind is not fully synced, the offers plugin in clightning 24.05
29+
# crashes (see https://github.com/ElementsProject/lightning/issues/7378).
30+
services.clightning.extraConfig = ''
31+
disable-dns
32+
disable-plugin=offers
33+
'';
2834

2935
services.lnd = {
3036
enable = true;

0 commit comments

Comments
 (0)