Merge fort-nix/nix-bitcoin#593: update nixpkgs
3a2730d287
btcpayserver: support restarting from the web interface (Erik Arvstedt)3480232f2a
update nixpkgs (Jonas Nick) Pull request description: ACKs for top commit: erikarvstedt: ACK3a2730d287
Tree-SHA512: 2750acc241c9790e1faf63f4f164421c9220376d5c57a46339a3aadc8093ea909cdb29b9026c4857642b346208dc012f4baa42832d267e512783fe860b8fca7e
This commit is contained in:
commit
1218a11633
@ -9,6 +9,9 @@ with lib;
|
|||||||
services.btcpayserver.enable = true;
|
services.btcpayserver.enable = true;
|
||||||
test.container.exposeLocalhost = true;
|
test.container.exposeLocalhost = true;
|
||||||
# services.btcpayserver.lbtc = false;
|
# services.btcpayserver.lbtc = false;
|
||||||
|
|
||||||
|
# Required for testing interactive plugin installation
|
||||||
|
test.container.enableWAN = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# A node with internet access to test joinmarket-ob-watcher
|
# A node with internet access to test joinmarket-ob-watcher
|
||||||
|
24
flake.lock
24
flake.lock
@ -10,11 +10,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1671802034,
|
"lastModified": 1673201375,
|
||||||
"narHash": "sha256-mkv2u5nQJEV3KlWiopkt/gMz0OM4nmEXSfzkSw6welQ=",
|
"narHash": "sha256-qlDIl1j6m3hrwbp993/1ncxyKfFRjt32zc3IHq6CeIk=",
|
||||||
"owner": "erikarvstedt",
|
"owner": "erikarvstedt",
|
||||||
"repo": "extra-container",
|
"repo": "extra-container",
|
||||||
"rev": "e34f0cca15f6f0f2e598dad0b329196d0dab6d4f",
|
"rev": "8448f0d65bb436550c2a6eece0dd1b43c8b33462",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -25,11 +25,11 @@
|
|||||||
},
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667395993,
|
"lastModified": 1676283394,
|
||||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -40,11 +40,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674407282,
|
"lastModified": 1676718858,
|
||||||
"narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=",
|
"narHash": "sha256-giQecvcifVLNHCC9lMfTGP09tNxXhOMw+d/aql7MhRw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49",
|
"rev": "e6d5772f3515b8518d50122471381feae7cbae36",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -56,11 +56,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674487464,
|
"lastModified": 1676763583,
|
||||||
"narHash": "sha256-Jgq50e4S4JVCYpWLqrabBzDp/1mfaxHCh8/OOorHTy0=",
|
"narHash": "sha256-y8j1GRwWeRN7KIrUIksgoTyYXWjraWvMtWK/cc4muNY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3954218cf613eba8e0dcefa9abe337d26bc48fd0",
|
"rev": "06365ba4549654b7ce58c33365c1282800e83a9e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -236,11 +236,16 @@ in {
|
|||||||
--datadir='${cfg.btcpayserver.dataDir}'
|
--datadir='${cfg.btcpayserver.dataDir}'
|
||||||
'';
|
'';
|
||||||
User = cfg.btcpayserver.user;
|
User = cfg.btcpayserver.user;
|
||||||
Restart = "on-failure";
|
# Also restart after the program has exited successfully.
|
||||||
RestartSec = "10s";
|
# 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 ];
|
ReadWritePaths = [ cfg.btcpayserver.dataDir ];
|
||||||
MemoryDenyWriteExecute = false;
|
MemoryDenyWriteExecute = false;
|
||||||
} // nbLib.allowedIPAddresses cfg.btcpayserver.tor.enforce;
|
} // nbLib.allowedIPAddresses cfg.btcpayserver.tor.enforce;
|
||||||
|
startLimitIntervalSec = 30;
|
||||||
|
startLimitBurst = 10;
|
||||||
}; in self;
|
}; in self;
|
||||||
|
|
||||||
users.users.${cfg.nbxplorer.user} = {
|
users.users.${cfg.nbxplorer.user} = {
|
||||||
|
@ -4,21 +4,21 @@ pkgs: pkgsUnstable:
|
|||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
bitcoin
|
bitcoin
|
||||||
bitcoind
|
bitcoind
|
||||||
elementsd
|
|
||||||
extra-container
|
extra-container
|
||||||
lightning-loop
|
lightning-loop
|
||||||
lightning-pool
|
lightning-pool
|
||||||
lndconnect
|
lndconnect;
|
||||||
nbxplorer;
|
|
||||||
|
|
||||||
inherit (pkgsUnstable)
|
inherit (pkgsUnstable)
|
||||||
btcpayserver
|
btcpayserver
|
||||||
charge-lnd
|
charge-lnd
|
||||||
clightning
|
clightning
|
||||||
electrs
|
electrs
|
||||||
|
elementsd
|
||||||
fulcrum
|
fulcrum
|
||||||
hwi
|
hwi
|
||||||
lnd;
|
lnd
|
||||||
|
nbxplorer;
|
||||||
|
|
||||||
inherit pkgs pkgsUnstable;
|
inherit pkgs pkgsUnstable;
|
||||||
}
|
}
|
||||||
|
@ -20,4 +20,4 @@ if [[ ${CACHIX_SIGNING_KEY:-} ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Running flake-info (nixos-search)"
|
echo "Running flake-info (nixos-search)"
|
||||||
flake-info flake ../..
|
flake-info --json flake ../.. >/dev/null
|
||||||
|
@ -41,4 +41,4 @@ bwrap \
|
|||||||
--ro-bind "$tmpDir/nix.conf" /etc/nix/nix.conf \
|
--ro-bind "$tmpDir/nix.conf" /etc/nix/nix.conf \
|
||||||
--ro-bind /usr /usr \
|
--ro-bind /usr /usr \
|
||||||
--ro-bind-try /run /run \
|
--ro-bind-try /run /run \
|
||||||
-- flake-info flake "$nbFlake"
|
-- flake-info --json flake "$nbFlake" >/dev/null
|
||||||
|
@ -39,11 +39,11 @@
|
|||||||
"npmlock2nix": "npmlock2nix"
|
"npmlock2nix": "npmlock2nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674593115,
|
"lastModified": 1676541227,
|
||||||
"narHash": "sha256-P4bjLR/8tJ/jVBBeHDzNS2BgVUdB6vS7Udfh30kULJs=",
|
"narHash": "sha256-UP5X8ik4pUFcGeFTivJyuLr3CTojhRnr4HkDAeb+6Ms=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixos-search",
|
"repo": "nixos-search",
|
||||||
"rev": "be9a717b8032c7410337139f9dcfd6227b7407a4",
|
"rev": "e5a15ec2e3faa55aba93a0d092b525ff5bd67467",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@ -54,11 +54,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1667629849,
|
"lastModified": 1673315479,
|
||||||
"narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=",
|
"narHash": "sha256-GNCFRtDHjTygXGJp/H+f2XQPMGxpYSmNiibIqYzihtM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "3bacde6273b09a21a8ccfba15586fb165078fb62",
|
"rev": "c07552f6f7d4eead7806645ec03f7f1eb71ba6bd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
Loading…
Reference in New Issue
Block a user