Erik Arvstedt
5634f08873
rtl: make extraConfig recursively mergeable
...
Previously, when merging different definitions of `extraConfig`,
only the top-level attrset was merged.
Example:
The two separate settings
nodes.lnd.extraConfig.Settings.userPersona = "MERCHANT";
nodes.lnd.extraConfig.Settings.logLevel = "DEBUG";
were previously merged into
nodes.lnd.extraConfig.Settings = { logLevel = "DEBUG" };
(The last definition has precedence.)
2023-01-20 13:46:08 +01:00
Erik Arvstedt
b76728a1ec
treewide: use bool literals for systemd
...
Run this from the repo root to check that there are no more remaining
bool strings:
grep -P '"true"|"false"' -r --exclude-dir=.git
2023-01-20 13:46:08 +01:00
Jonas Nick
84fc4d48d3
Merge fort-nix/nix-bitcoin#574 : Add dev helper and docs
...
b4d7e1aa8fb35d08d3f24d76eb9183dc0710f3f49e30d2728bc6d85c6fe3a51f7b419eb4d7e1aa8f
2023-01-18 20:53:24 +00:00
Erik Arvstedt
b4d7e1aa8f
add dev helper and docs
2023-01-15 20:28:49 +01:00
Erik Arvstedt
b35d08d3f2
docs: move test docs from examples/README to test/README
2023-01-15 20:28:48 +01:00
Erik Arvstedt
4d76eb9183
docs/configuration: fix typo
2023-01-15 20:28:48 +01:00
Erik Arvstedt
dc0710f3f4
tests: add example scenario customTest
2023-01-15 20:28:48 +01:00
Jonas Nick
dfeff7b17b
Merge fort-nix/nix-bitcoin#582 : update nixpkgs
...
9019a17bfcaae4b6bfc59019a17bfc
2023-01-08 10:57:06 +00:00
Erik Arvstedt
9019a17bfc
versioning: add fulcrum db change info
2023-01-07 19:32:54 +00:00
Jonas Nick
aae4b6bfc5
update nixpkgs
...
btcpayserver: 1.7.1 -> 1.7.2
fulcrum: 1.8.2 -> 1.9.0
nbxplorer: 2.3.49 -> 2.3.54
2023-01-06 22:53:47 +00:00
Erik Arvstedt
9e30d2728b
tests: formatting
...
Move line next to `services.lnd` config for clarity.
2023-01-06 23:46:43 +01:00
Erik Arvstedt
c6d85c6fe3
tests: fix broken unit file when clightning is disabled
...
Previously, an incomplete clightning unit was always created because
attr `clightning` was always defined in option attrset `systemd.services`.
2023-01-06 23:46:43 +01:00
Erik Arvstedt
a51f7b419e
run-tests: use arg instead of env var for scenario overrides
...
This removes a source of implicit state and guarantees that regular
calls to `run-tests.sh` always run the builtin tests.
2023-01-06 23:46:43 +01:00
Jonas Nick
da612fe84f
Merge fort-nix/nix-bitcoin#577 : Upgrade to NixOS 22.11
...
4b5b4eac588d476cfeaf00cceca861e4b8e14d3ad1ef2a6e1e74c8593407109dccca27a9c1995ed99e456ea3a977d58162e7142cbcfb37c9b1e59f2062515a56964b5b4eac58
2023-01-06 22:37:46 +00:00
Erik Arvstedt
4b5b4eac58
examples/deploy-container: fix sudo env propagation
...
Env vars can't be reliably passed through `sudo`, so always
call nix-shell to setup the env after running sudo.
2023-01-06 23:23:54 +01:00
Erik Arvstedt
8d476cfeaf
nix-bitcoin/runAsUserCmd: remove workaround
2023-01-03 16:18:27 +01:00
Jonas Nick
700b6d8c90
Merge fort-nix/nix-bitcoin#580 : minor typo
...
1b4c5749f6
2023-01-02 20:32:13 +00:00
JayDeLux
1b4c5749f6
minor typo
2022-12-28 16:31:03 +01:00
Jonas Nick
a6ab131e7d
Merge fort-nix/nix-bitcoin#578 : rtl: 0.13.1 -> 0.13.2
...
314020b246314020b246
2022-12-22 22:18:13 +00:00
Erik Arvstedt
314020b246
rtl: 0.13.1 -> 0.13.2
2022-12-20 23:24:24 +01:00
Erik Arvstedt
00cceca861
joinmarket: fix Python packages
2022-12-18 20:01:53 +01:00
Erik Arvstedt
e4b8e14d3a
clightning: fix Python packages
...
Patching `pyln-proto` to use cryptography 38 lets
us avoid adding many older Python pkg versions.
The backwards incompatible changes from cryptography 36 to 38
only include the removal of deprecated fns that pyln-proto
doesn't use.
See string "BACKWARDS INCOMPATIBLE" in
https://cryptography.io/en/latest/changelog/
2022-12-18 20:01:53 +01:00
Erik Arvstedt
d1ef2a6e1e
pythonPackages: improve layout
...
- Move the creation of the joinmarket Python pkgs from
`joinmarket/default.nix` to `pkgs/python-packages/default.nix`.
- Move definitions of old pkg versions from the main Python pkgs
to the joinmarket Python pkgs.
These old versions are only required by joinmarket.
2022-12-18 20:01:52 +01:00
Erik Arvstedt
74c8593407
pythonPackages: add indentation
...
This makes the following commit more readable.
2022-12-18 20:01:52 +01:00
Erik Arvstedt
109dccca27
treewide: use mdDoc for descriptions
...
Enable markdown syntax (instead of docbook) for descriptions.
This only affects external doc tooling that renders the descriptions.
2022-12-18 20:01:52 +01:00
Erik Arvstedt
a9c1995ed9
treewide: rename maintainer earvstedt -> erikarvstedt
2022-12-18 20:01:52 +01:00
Erik Arvstedt
9e456ea3a9
shellcheck-services.nix: update to NixOS 22.11
2022-12-18 20:01:52 +01:00
Erik Arvstedt
77d58162e7
test: update to NixOS 22.11
2022-12-18 20:01:52 +01:00
Erik Arvstedt
142cbcfb37
flake: remove 32-bit systems
2022-12-18 20:01:52 +01:00
Erik Arvstedt
c9b1e59f20
update to NixOS 22.11
...
This includes no pkg version updates.
2022-12-18 20:01:52 +01:00
Erik Arvstedt
62515a5696
helper/update-flake: support updating NixOS versions
2022-12-18 20:01:48 +01:00
Jonas Nick
932e4c93bc
Merge fort-nix/nix-bitcoin#576 : joinmarket: 0.9.7 -> 0.9.8
...
81166a012e81166a012e
2022-12-17 13:52:42 +00:00
Jonas Nick
84382e3338
Merge fort-nix/nix-bitcoin#573 : update nixpkgs
...
d1b3a4617d875fac6862d1b3a4617d
2022-12-17 13:33:38 +00:00
Jonas Nick
d1b3a4617d
clightning: set "database-upgrade=true" for 22.11.1
2022-12-17 12:43:33 +00:00
nixbitcoin
81166a012e
joinmarket: 0.9.7 -> 0.9.8
2022-12-15 17:47:35 +00:00
Jonas Nick
875fac6862
update nixpkgs
...
btcpayserver: 1.6.12 -> 1.7.1
bitcoind: 24.0 -> 24.0.1
clightning: 0.12.1 -> 22.11.1
lnd: 0.15.4-beta -> 0.15.5-beta
nbxplorer: 2.3.41 -> 2.3.49
2022-12-14 14:48:54 +00:00
Jonas Nick
5cafafd027
Merge fort-nix/nix-bitcoin#572 : update nixpkgs
...
d9fdc49e9ad9fdc49e9a
2022-11-28 14:40:13 +00:00
Jonas Nick
d9fdc49e9a
update nixpkgs
...
bitcoin: 23.0 -> 24.0
bitcoind: 23.0 -> 24.0
charge-lnd: 0.2.12 -> 0.2.13
2022-11-28 12:54:11 +00:00
Jonas Nick
8b091eb661
Merge fort-nix/nix-bitcoin#571 : lnd: support INADDR_ANY addresses for bitcoind.zmqpubraw*
...
c5493717b7c5493717b7
2022-11-20 22:11:28 +00:00
Erik Arvstedt
c5493717b7
lnd: support INADDR_ANY addresses for bitcoind.zmqpubraw*
...
Also use `mkDefault` when defining `bitcoind.zmqpubraw*` to simplify
overriding for users.
2022-11-11 12:10:00 +01:00
Jonas Nick
81350a03c9
Merge fort-nix/nix-bitcoin#570 : Update nixpkgs
...
a333989ca8313e374774a333989ca8
2022-11-10 12:56:47 +00:00
Jonas Nick
4a533d90ea
Merge fort-nix/nix-bitcoin#568 : Minor improvements
...
0de16095e1d332177d3e1b5e51b7fe565deb770a0de16095e1
2022-11-10 12:56:12 +00:00
Jonas Nick
1800ed7cb3
Merge fort-nix/nix-bitcoin#569 : treewide: set shebang for bash scripts
...
0447c5bacb0447c5bacb
2022-11-10 11:08:24 +00:00
Jonas Nick
a333989ca8
update nixpkgs
...
electrs: 0.9.9 -> 0.9.10
elementsd: 22.0 -> 22.0.2
extra-container: 0.10 -> 0.11
lnd: 0.15.2-beta -> 0.15.4-beta
2022-11-10 11:03:23 +00:00
Jonas Nick
313e374774
Revert "pkgs: add lnd 0.15.4 (hotfix)"
...
This reverts commit 57b76d4461
2022-11-10 10:56:12 +00:00
Erik Arvstedt
0447c5bacb
treewide: set shebang for bash scripts
...
These scripts previously failed when called with syscalls like
`execve` (used by, e.g., Python's `subprocess.run`) that use no default
interpreter for scripts without a shebang.
2022-11-08 23:04:56 +01:00
Erik Arvstedt
0de16095e1
clightning-replication: switch system before waiting for server sshd
...
This is primarily a cosmetic change.
- Increases code clarity because all system test blocks now start with `switch_to_system`
- Optimizes dependency ordering because `switch_to_system` has no
dependency on the server sshd
2022-11-04 11:51:44 +01:00
Erik Arvstedt
d332177d3e
clightning: extract var bitcoind
...
Follow the default module formatting style.
2022-11-04 11:07:36 +01:00
Erik Arvstedt
1b5e51b7fe
examples/vm-config: fix syntax error
2022-11-04 00:33:53 +01:00
Erik Arvstedt
565deb770a
examples/minimal-vm: add lightning-cli demo command
2022-11-04 00:33:31 +01:00
