Merge #748: update nixpkgs

b9019d1 test: remove clightning TODO-EXTERNAL requiring to disable offers (Jonas Nick) 7fb481c update nixpkgs (Jonas Nick) Pull request description: ACKs for top commit: erikarvstedt: ACK b9019d1 Tree-SHA512: 0f18de71c4f98e29ccccc9150c8138fcaf860f6e7813ec9ee6ed76efec2340c35edfdbe75f0b6bb59b4fe407f0e1f9579ed5cda6f970bfb66625398f5a80161f
fort-nix · Dec 2, 2024 · ff847d5 · ff847d5
2 parents 64fb83b + b9019d1
commit ff847d5
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 59 deletions.
diff --git a/examples/deploy-container-minimal.sh b/examples/deploy-container-minimal.sh
@@ -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

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

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

diff --git a/examples/krops-vm-configuration.nix b/examples/krops-vm-configuration.nix
@@ -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
-  '';
 }
diff --git a/examples/qemu-vm/minimal-vm.nix b/examples/qemu-vm/minimal-vm.nix
@@ -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

diff --git a/flake.lock b/flake.lock
diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
@@ -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;
 

diff --git a/test/clightning-replication.nix b/test/clightning-replication.nix
@@ -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
       '';
     };
   };

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,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;