Erik Arvstedt
49e30f7172
test/lib/create-git-repo: fix empty var expansion
...
When `amend` is empty, expand it to nothing instead of an empty
string (which causes a git error).
2022-09-07 11:02:15 +02:00
Jonas Nick
462c2541d7
Merge fort-nix/nix-bitcoin#547 : tests: disable nixosSearch
...
7985e075e5
README: remove nixos-search (Erik Arvstedt)
c63da4734e
tests: disable `nixosSearch` (Erik Arvstedt)
Pull request description:
ACKs for top commit:
jonasnick:
ACK 7985e075e5
Tree-SHA512: 3f6781ee7d6d026c36029fde47f146629d7c4eb59428fb1c2a904e1a36c8b4236f4b96c604c05f30063051eba2b6b3d13ceac44104590be61944d175b3f20638
2022-09-07 08:43:11 +00:00
Erik Arvstedt
7985e075e5
README: remove nixos-search
2022-09-07 10:24:16 +02:00
Erik Arvstedt
c63da4734e
tests: disable nixosSearch
2022-09-05 21:11:15 +02:00
Jonas Nick
6fed9b25cd
Merge fort-nix/nix-bitcoin#544 : joinmarket: 0.9.6 -> 0.9.7
...
b9d2a882a7
joinmarket: 0.9.6 -> 0.9.7 (nixbitcoin)
Pull request description:
ACKs for top commit:
erikarvstedt:
ACK b9d2a882a7
Tree-SHA512: 48f65f829f35b2b20d6fb95bd829db66bf7f11fcf97aad0c9e1673544f6420168f10a40fe3748d50c1f582c1be2b4ea7917dbbabb3661fa85cfff828fb56c8f7
2022-09-02 13:48:25 +00:00
nixbitcoin
b9d2a882a7
joinmarket: 0.9.6 -> 0.9.7
2022-09-02 11:11:26 +00:00
Jonas Nick
6145dc3032
Merge fort-nix/nix-bitcoin#539 : Minor improvements
...
67a573dae8
create-git-repo.sh: fix amend error if there's no branch checked out (Erik Arvstedt)
d9eecb7d4c
nixos-search/flake: remove unused output (Erik Arvstedt)
4e70db14bc
README: fix capitalization (Erik Arvstedt)
030be842c8
secrets: use fetchurl derivation (Erik Arvstedt)
1713e016a0
clightning-replication: clarify comment about FUSE mounts (Erik Arvstedt)
cd3878e357
delete modules/default.nix (Erik Arvstedt)
f2a4d1fe65
docs/security: fix typo (Erik Arvstedt)
3a65dc0dc9
docs/configuration: improve section `Remote bitcoind` (Erik Arvstedt)
af115d746b
internal scripts: use pinned, cached pkgs (Erik Arvstedt)
Pull request description:
ACKs for top commit:
jonasnick:
ACK 67a573dae8
Tree-SHA512: 9ab2e9141793996eeae94cf2bb630491489a479841858187719fee9cf39e56b1db8bfc09f9466026b7409e160bb2047b374047ca4d2f7249077895c804663bd0
2022-08-29 11:38:48 +00:00
Erik Arvstedt
67a573dae8
create-git-repo.sh: fix amend error if there's no branch checked out
...
In this case, `git commit --amend` fails.
The state of a .git repo existing without a branch being checked out
can be reached through the following sequence of events (which I just
seem to have triggered):
1. The script calls `git init`
2. The user interrupts the script before `git commit` is finished
2022-08-29 00:12:19 +02:00
Erik Arvstedt
d9eecb7d4c
nixos-search/flake: remove unused output
2022-08-29 00:12:19 +02:00
Erik Arvstedt
4e70db14bc
README: fix capitalization
2022-08-29 00:12:18 +02:00
Erik Arvstedt
030be842c8
secrets: use fetchurl derivation
...
This moves fetching from eval time to build time, which is a better
fit for fetching build time resources.
2022-08-29 00:12:17 +02:00
Erik Arvstedt
1713e016a0
clightning-replication: clarify comment about FUSE mounts
2022-08-28 23:49:12 +02:00
Erik Arvstedt
cd3878e357
delete modules/default.nix
...
This file has been missing some modules for quite some time.
Remove it to simplify maintenance.
2022-08-28 23:49:12 +02:00
Erik Arvstedt
f2a4d1fe65
docs/security: fix typo
2022-08-28 23:49:12 +02:00
Erik Arvstedt
3a65dc0dc9
docs/configuration: improve section Remote bitcoind
2022-08-28 23:49:12 +02:00
Erik Arvstedt
af115d746b
internal scripts: use pinned, cached pkgs
...
Instead of setting up the script PATH via nix-shell, use
`nix shell` with inputs from the nix-bitcoin flake.
Advantages:
- Uses the nixpkgs version from the nix-bitcoin flake instead of
`<nixpkgs>` from the user env (NIX_PATH), so the script runtime
env is reproducible.
- The pkg derivations for the runtime env are cached, which greatly
increases script startup speed.
This commit was generated by running the following script inside the
repo root dir:
def transform(path, src)
if src =~ /#! *nix-shell +-i +bash +-p +(.*)/
pkgs = $1
if src =~ /^.*?(set -e.*?pipefail)\n/
set_statement = $1
src.sub!($&, '')
end
src.sub!(/\A.*?#! *nix-shell.*?\n/m, '')
parents = ([ '..' ] * (path.split('/').count - 1)).join('/')
[
'#!/usr/bin/env bash',
*set_statement,
%(. "${BASH_SOURCE[0]%/*}/#{parents}/helper/run-in-nix-env" "#{pkgs}" "$@"),
nil,
src
].join("\n")
end
end
Dir['**/*.sh'].each do |f|
src = File.read(f)
if new_src = transform(f, src)
puts "Changed file #{f}"
File.write(f, new_src)
end
end
2022-08-28 23:49:12 +02:00
Jonas Nick
4cd9d0c6de
Merge fort-nix/nix-bitcoin#542 : rtl: 0.13.0 -> 0.13.1, clightning-rest: 0.8.0 -> 0.9.0
...
02f1599503
clightning-rest: 0.8.0 -> 0.9.0 (Erik Arvstedt)
c3769014b1
rtl: 0.13.0 -> 0.13.1 (Erik Arvstedt)
Pull request description:
ACKs for top commit:
jonasnick:
ACK 02f1599503
Tree-SHA512: b3bc9937ab3bb19702686c459ce920adaf83972c96c26568f7b0447f2ca200552e873e33120785268f86c582b575befb4b163fe8fae5eefe445ebd0b7244e334
2022-08-28 19:08:32 +00:00
Jonas Nick
1ca8b3d7b9
Merge fort-nix/nix-bitcoin#531 : ShellCheck for various helper bash scripts
...
91a03ce7d2
shellcheck: fix lint of scripts in /helper (Otto Sabart)
f184bb34e6
shellcheck: fix lint of scripts in tests (Otto Sabart)
a59c3b4b8a
shellcheck: fix lint of package helper bash scripts (Otto Sabart)
9a92d29111
tests: add shellcheck (Otto Sabart)
b625325487
ci/modules_test: use flake-enabled nix (Erik Arvstedt)
Pull request description:
ACKs for top commit:
erikarvstedt:
ACK 91a03ce7d2
jonasnick:
ACK 91a03ce7d2
Tree-SHA512: 6ece237a6160d9c1c80d93d86aaa9a3b7ad5e2ca6c3b0b47f87e12e739fc3b34ac1e21f6bcf6f483c440aa98650ac6b8672ce80fa62717fa8352b4c0a9903d3e
2022-08-28 17:26:07 +00:00
Otto Sabart
91a03ce7d2
shellcheck: fix lint of scripts in /helper
2022-08-28 18:25:37 +02:00
Otto Sabart
f184bb34e6
shellcheck: fix lint of scripts in tests
2022-08-28 18:25:37 +02:00
Otto Sabart
a59c3b4b8a
shellcheck: fix lint of package helper bash scripts
2022-08-28 18:25:37 +02:00
Otto Sabart
9a92d29111
tests: add shellcheck
2022-08-28 18:25:37 +02:00
Erik Arvstedt
b625325487
ci/modules_test: use flake-enabled nix
2022-08-28 18:25:37 +02:00
Erik Arvstedt
02f1599503
clightning-rest: 0.8.0 -> 0.9.0
2022-08-27 14:09:48 +02:00
Erik Arvstedt
c3769014b1
rtl: 0.13.0 -> 0.13.1
2022-08-27 14:09:48 +02:00
Jonas Nick
ae76fbbc4b
Merge fort-nix/nix-bitcoin#541 : img/logo: add LICENSE
...
db3c0f0519
img/logo: add LICENSE (Erik Arvstedt)
Pull request description:
Top commit has no ACKs.
Tree-SHA512: 076087ad9514af9bbd086b0fa6ab9aee6af993078155900cbffde1dc74ffdbe43f3d70f89ed8d15461800f538526d5f91e6e7c0f90fa664df254972eecd92b2b
2022-08-26 11:04:17 +00:00
Erik Arvstedt
db3c0f0519
img/logo: add LICENSE
2022-08-26 10:22:29 +02:00
Jonas Nick
81bf18b5ab
Merge fort-nix/nix-bitcoin#538 : rtl: 0.12.3 -> 0.13.0, clightning-rest: 0.7.2 -> 0.8.0
...
53dd2a1ae2
cl-rest: 0.7.2 -> 0.8.0 (Erik Arvstedt)
617ed4c8e8
rtl: 0.12.3-beta -> 0.13.0 (Erik Arvstedt)
e63dafe0f7
pkgs: add `fetch-node-modules` (Erik Arvstedt)
Pull request description:
ACKs for top commit:
jonasnick:
ACK 53dd2a1ae2
Tree-SHA512: aa4854b48d0186887a2db42b1f5e8fb27dc7da4ba6def50ee0a33d76ceb5425f593fb0c159e81809b67dda441559262872a331476136195c8033db94cc302026
2022-08-21 18:23:03 +00:00
Jonas Nick
b214018c29
Merge fort-nix/nix-bitcoin#537 : update nixpkgs
...
321e8ba06e
clightning: fix build (Erik Arvstedt)
44561235b2
rtl: set explicit nodejs version (Erik Arvstedt)
f2cb5bfc10
update nixpkgs (Erik Arvstedt)
Pull request description:
ACKs for top commit:
jonasnick:
ACK 321e8ba06e
Tree-SHA512: f15d29ca63d88e4253a6bfe5f310e80092f1dd2e932be41e9e35d60636b12e617ed5c9ddc9ee8a200646973a66603e776adf07f5bac82ce635499095a92340fc
2022-08-21 17:13:19 +00:00
Erik Arvstedt
53dd2a1ae2
cl-rest: 0.7.2 -> 0.8.0
...
- Use `fetch-node-modules`
- Only use nodejs-slim as a runtime dependency
2022-08-21 19:11:51 +02:00
Erik Arvstedt
617ed4c8e8
rtl: 0.12.3-beta -> 0.13.0
...
- Use `fetch-node-modules` to remove the 4161 line file `node-packages.nix`
- Only use nodejs-slim as a runtime dependency
- Shrink package size by >500M by excluding certain dev-only dependencies
2022-08-21 19:11:51 +02:00
Erik Arvstedt
e63dafe0f7
pkgs: add fetch-node-modules
2022-08-21 19:11:51 +02:00
Erik Arvstedt
321e8ba06e
clightning: fix build
2022-08-21 10:23:33 +02:00
Erik Arvstedt
44561235b2
rtl: set explicit nodejs version
2022-08-21 10:23:33 +02:00
Erik Arvstedt
f2cb5bfc10
update nixpkgs
...
nbxplorer: 2.3.28 -> 2.3.33
btcpayserver: 1.6.1 -> 1.6.9
charge-lnd: 0.2.4 -> 0.2.12
lightning-loop: 0.19.1-beta -> 0.20.0-beta
2022-08-21 10:23:33 +02:00
Jonas Nick
749ed146d3
Merge fort-nix/nix-bitcoin#436 : clightning: native database replication
...
5eb01498d5
tests: add comment (Erik Arvstedt)
952cd3773f
run-tests: support tests with multiple VMs in `run` (Erik Arvstedt)
17507835fc
clightning: native database replication (nixbitcoin)
Pull request description:
ACKs for top commit:
erikarvstedt:
ACK 5eb01498d5
jonasnick:
ACK 5eb01498d5
Tree-SHA512: 22cd8236e9846b9540847a82e45dcc114f24373a90fdb12efadfcdff1bb5ac6db008900f8156e77e84c24a304c1ee63bd07998443c28640cc467a9a0fc23560a
2022-08-13 19:54:05 +00:00
Jonas Nick
8404385d60
Merge fort-nix/nix-bitcoin#530 : onion-services: don't propagate restart of onion-addresses
to depending services
...
a3490dfc0f
onion-services: don't propagate restart of `onion-addresses` to depending services (Erik Arvstedt)
Pull request description:
ACKs for top commit:
jonasnick:
utACK a3490dfc0f
Tree-SHA512: a060e22d6db5b986d41d50b4efff1d24fd514a4faae6152e37521681e373b074d18d901f274d182445a8446fd7fcee1b6b2728bc3fda8f2f1b97a77d92a93aeb
2022-08-13 19:07:12 +00:00
Erik Arvstedt
5eb01498d5
tests: add comment
2022-08-05 13:48:53 +00:00
Erik Arvstedt
952cd3773f
run-tests: support tests with multiple VMs in run
2022-08-05 13:48:36 +00:00
nixbitcoin
17507835fc
clightning: native database replication
...
Don't put `clightning.replication` options in
`examples/configuration.nix` until it is more "battle-tested."
2022-08-05 13:48:24 +00:00
Erik Arvstedt
a3490dfc0f
onion-services: don't propagate restart of onion-addresses
to depending services
...
Currently, public services that publish their onion addresses have a
`requires` dependeny on service `onion-addresses`, so they are restarted
when `onion-addresses` restarts.
This has the downside that most of nix-bitcoin's services are restarted
when a new onion service is added and the system config has the following common settings:
- nix-bitcoin.onionServices.bitcoind.public = true
- nix-bitcoin.operator.enable = true
Sequence of events:
1. onion service is added
2. `onion-addresses` restarts, because the new onion service is made available to `operator`
3. bitcoind restarts
4. all depending services restart
Fix this by using a `wants` dependency.
2022-08-04 11:48:26 +02:00
Jonas Nick
55fc77d72f
Merge fort-nix/nix-bitcoin#527 : readme: add nixos options search
...
7544c62970
readme: add nixos options search (Erik Arvstedt)
Pull request description:
ACKs for top commit:
jonasnick:
ACK 7544c62970
Tree-SHA512: 27de5e5f0cebaf30371e8737230f451f03cddb43391ddd5c31817dff82e7402be9eb8e006636d491075a052eeb6bf886e08ca8e2076e46044ca21eb46a7c0d8b
2022-07-29 18:10:36 +00:00
Erik Arvstedt
7544c62970
readme: add nixos options search
2022-07-29 17:24:32 +02:00
Jonas Nick
8e7bd323b7
Merge fort-nix/nix-bitcoin#525 : clightning: add currencyrate plugin
...
e3c54aa64e
clightning: add currencyrate plugin (William Casarin)
31af0df05b
clightning-plugins: bump (William Casarin)
Pull request description:
ACKs for top commit:
erikarvstedt:
ACK e3c54aa64e
Tree-SHA512: f22378368fd67d9c54d94c0cf264d9bac43b0ef752d156bff1f5c333867ef8aacb6f3961df62ccf8822b4b4d14c3a05f27c5a72552dc5465788384ac768b83ee
2022-07-27 11:38:26 +00:00
William Casarin
e3c54aa64e
clightning: add currencyrate plugin
...
Add the currencyrate plugin. This is used by other plugins to fetch
currency rates. This can be used for setting fiat amounts in bolt12
invoices.
Signed-off-by: William Casarin <jb55@jb55.com>
2022-07-26 14:47:40 +02:00
William Casarin
31af0df05b
clightning-plugins: bump
...
Signed-off-by: William Casarin <jb55@jb55.com>
2022-07-25 18:23:11 -07:00
Jonas Nick
fbbaaa7a29
Merge fort-nix/nix-bitcoin#524 : operator: fix syntax error in description
...
9c5dbeaa83
test/nixos-search: fix wrong flake being tested (Erik Arvstedt)
42bf0422e0
operator: fix syntax error in description (Erik Arvstedt)
Pull request description:
ACKs for top commit:
jonasnick:
ACK 9c5dbeaa83
Tree-SHA512: 410f12a140e0d8e96690fbf1b95e2f50a7a273d3a0a7b33b390c088467a2f10004ddf98572c93a530cb0e21cb5d4551ae5cd93cf5b047c9b57a0bde7d3e394f4
2022-07-24 14:04:50 +00:00
Jonas Nick
41892bea22
Merge fort-nix/nix-bitcoin#523 : examples/deploy-krops: fix missing secrets
...
7d5182298b
examples/deploy-krops: fix missing secrets (Erik Arvstedt)
Pull request description:
ACKs for top commit:
jonasnick:
ACK 7d5182298b
Tree-SHA512: f230ecf012b6e43525ad8df23f0012939e5988f82985c14459b85c567b161aedfa1f1c4d0b9d31600827036e433314074dd3df3b9769ad9a2c056ec6c0418cb7
2022-07-24 06:08:11 +00:00
Erik Arvstedt
9c5dbeaa83
test/nixos-search: fix wrong flake being tested
...
Now the test targets the main nix-bitcoin flake instead of the
nixos-search flake.
Also remove `NIX_PATH`, which is no longer required.
2022-07-22 17:41:31 +02:00
Erik Arvstedt
42bf0422e0
operator: fix syntax error in description
...
Fix error `Invalid XML` when running flake-info (nixos-search) .
2022-07-22 17:17:11 +02:00