Merge #711: update nixpkgs

b26cea0 update nixpkgs (Jonas Nick) Pull request description: ACKs for top commit: erikarvstedt: ACK b26cea0 Tree-SHA512: 1c947307f0e89c89b931ee2c66675544a0fd37d878bf80acc940bdd023d2f0576b0b02a098ed36fe93bb334b877027f22077e3039fe8a609c2230a53e860fd17
fort-nix · Jul 3, 2024 · 652b67e · 652b67e
2 parents efd8ea7 + b26cea0
commit 652b67e
Show file tree

Hide file tree

Showing 10 changed files with 88 additions and 21 deletions.
diff --git a/examples/deploy-container-minimal.sh b/examples/deploy-container-minimal.sh
@@ -21,7 +21,13 @@ cat > "$tmpDir/configuration.nix" <<EOF
       password = "a";
     };
     # When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s
-    services.clightning.extraConfig = "disable-dns";
+    # 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
 

diff --git a/examples/deploy-container.sh b/examples/deploy-container.sh
@@ -83,6 +83,13 @@ 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
+      '';
     };
   };
 }

diff --git a/examples/deploy-qemu-vm.sh b/examples/deploy-qemu-vm.sh
@@ -30,6 +30,13 @@ 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

diff --git a/examples/krops-vm-configuration.nix b/examples/krops-vm-configuration.nix
@@ -4,4 +4,11 @@
     <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
+  '';
 }
diff --git a/examples/qemu-vm/minimal-vm.nix b/examples/qemu-vm/minimal-vm.nix
@@ -26,8 +26,14 @@ rec {
 
       nix-bitcoin.generateSecrets = true;
       services.clightning.enable = true;
-      # For faster startup in offline VMs
-      services.clightning.extraConfig = "disable-dns";
+      # 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
       documentation.nixos.enable = false;

diff --git a/flake.lock b/flake.lock
diff --git a/test/clightning-replication.nix b/test/clightning-replication.nix
@@ -24,7 +24,13 @@ let
 
       # TODO-EXTERNAL:
       # When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
-      extraConfig = "disable-dns";
+      # 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
+      '';
     };
   };
 in

diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock
diff --git a/test/tests.nix b/test/tests.nix
@@ -43,7 +43,13 @@ let
 
       # TODO-EXTERNAL:
       # When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
-      services.clightning.extraConfig = mkIf config.test.noConnections "disable-dns";
+      # 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;
         removed = [

diff --git a/test/wireguard-lndconnect.nix b/test/wireguard-lndconnect.nix
@@ -24,7 +24,13 @@ makeTestVM {
       };
       # TODO-EXTERNAL:
       # When WAN is disabled, DNS bootstrapping slows down service startup by ~15 s.
-      services.clightning.extraConfig = "disable-dns";
+      # 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
+      '';
 
       services.lnd = {
         enable = true;