Merge #593: update nixpkgs

3a2730d btcpayserver: support restarting from the web interface (Erik Arvstedt) 3480232 update nixpkgs (Jonas Nick) Pull request description: ACKs for top commit: erikarvstedt: ACK 3a2730d Tree-SHA512: 2750acc241c9790e1faf63f4f164421c9220376d5c57a46339a3aadc8093ea909cdb29b9026c4857642b346208dc012f4baa42832d267e512783fe860b8fca7e
fort-nix · Feb 27, 2023 · 1218a11 · 1218a11
2 parents cd4060f + 3a2730d
commit 1218a11
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 26 deletions.
diff --git a/dev/dev-scenarios.nix b/dev/dev-scenarios.nix
@@ -9,6 +9,9 @@ with lib;
     services.btcpayserver.enable = true;
     test.container.exposeLocalhost = true;
     # services.btcpayserver.lbtc = false;
+
+    # Required for testing interactive plugin installation
+    test.container.enableWAN = true;
   };
 
   # A node with internet access to test joinmarket-ob-watcher

diff --git a/flake.lock b/flake.lock
diff --git a/modules/btcpayserver.nix b/modules/btcpayserver.nix
@@ -236,11 +236,16 @@ in {
             --datadir='${cfg.btcpayserver.dataDir}'
         '';
         User = cfg.btcpayserver.user;
-        Restart = "on-failure";
-        RestartSec = "10s";
+        # Also restart after the program has exited successfully.
+        # This is required to support restarting from the web interface after
+        # interactive plugin installation.
+        # Restart rate limiting is implemented via the `startLimit*` options below.
+        Restart = "always";
         ReadWritePaths = [ cfg.btcpayserver.dataDir ];
         MemoryDenyWriteExecute = false;
       } // nbLib.allowedIPAddresses cfg.btcpayserver.tor.enforce;
+      startLimitIntervalSec = 30;
+      startLimitBurst = 10;
     }; in self;
 
     users.users.${cfg.nbxplorer.user} = {

diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
@@ -4,21 +4,21 @@ pkgs: pkgsUnstable:
   inherit (pkgs)
     bitcoin
     bitcoind
-    elementsd
     extra-container
     lightning-loop
     lightning-pool
-    lndconnect
-    nbxplorer;
+    lndconnect;
 
   inherit (pkgsUnstable)
     btcpayserver
     charge-lnd
     clightning
     electrs
+    elementsd
     fulcrum
     hwi
-    lnd;
+    lnd
+    nbxplorer;
 
   inherit pkgs pkgsUnstable;
 }
diff --git a/test/nixos-search/ci-test.sh b/test/nixos-search/ci-test.sh
@@ -20,4 +20,4 @@ if [[ ${CACHIX_SIGNING_KEY:-} ]]; then
 fi
 
 echo "Running flake-info (nixos-search)"
-flake-info flake ../..
+flake-info --json flake ../.. >/dev/null
diff --git a/test/nixos-search/flake-info-sandboxed.sh b/test/nixos-search/flake-info-sandboxed.sh
@@ -41,4 +41,4 @@ bwrap \
   --ro-bind "$tmpDir/nix.conf" /etc/nix/nix.conf \
   --ro-bind /usr /usr \
   --ro-bind-try /run /run \
-  -- flake-info flake "$nbFlake"
+  -- flake-info --json flake "$nbFlake" >/dev/null
diff --git a/test/nixos-search/flake.lock b/test/nixos-search/flake.lock