Commit Graph

1789 Commits

Author SHA1 Message Date
Jonas Nick
c7eab98a31
tests: fix deprecation warning 2022-06-27 21:15:38 +00:00
Jonas Nick
805eb26d12
update nixpkgs (stable: 21.11 -> 22.05)
extra-container: 0.8 -> 0.10
btcpayserver: 1.5.3 -> 1.5.4
lightning-loop: 0.18.0-beta -> 0.19.1-beta
2022-06-27 21:15:34 +00:00
Erik Arvstedt
96144fde81
update-flake.nix: fix stable pkgs selection
In rare cases, the nixpkgs stable version of a package can be newer
than in unstable nixpkgs. [1]
When this happens, choose the newer stable version instead of the
older unstable version.

[1] E.g., when a package is updated in both nixpkgs stable and unstable,
and nixpkgs stable is released before unstable.
2022-06-27 22:19:06 +02:00
Jonas Nick
1ba7ccc547
Merge fort-nix/nix-bitcoin#492: Improve flake
c8d5cb2405 examples: improve Flakes-based VM (Erik Arvstedt)
1e94e891b2 flake: move VM to separate file (Erik Arvstedt)
7233b054d9 flake: use new output format (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK c8d5cb2405

Tree-SHA512: ffc5525530a50e7664f9b081f68eb3d379f726b7f40133d1e874d41ce84814e44d1e57661803c0cf3aabae58b493cb60968b1dd75d9e4cbe5877f02c4cd6abc2
2022-06-05 19:37:16 +00:00
Jonas Nick
043ef53cb9
Merge fort-nix/nix-bitcoin#489: Update nixpkgs & joinmarket: 0.9.5 -> 0.9.6
cb295d1a16 joinmarket: 0.9.5 -> 0.9.6 (nixbitcoin)
568d728e5c joinmarket: put python-packages in alphabetical order (nixbitcoin)
a3ff1351d9 update nixpkgs (Jonas Nick)
636d508b50 spark-wallet: use nodejs 14 instead of 12 since latter is EOL (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK cb295d1a16

Tree-SHA512: ca124de4d393c3828454599e4d3d3357560a6ae902c569b3edabf395cd6f5d50d8904db9f078f02b70cd0b67d013a263d238e9bc36ba34bc1bb7d9d9fd02a7e9
2022-06-04 07:56:24 +00:00
Jonas Nick
9a860738ee
Merge fort-nix/nix-bitcoin#494: Fix cln rpc path for btcpayserver on regtest
961192313c Fix cln rpc path for btcpayserver on regtest (Alekos Filini)

Pull request description:

ACKs for top commit:
  jonasnick:
    utACK 961192313c

Tree-SHA512: 4aaf4e04b99bbda006cc4c267773456552cd3478028a336295810e5c776138fbb2798a39ba6c7c51b70f976b5a8f4f93bdc9f8ff15682c6eca604f47adb8ecae
2022-06-04 07:54:44 +00:00
Alekos Filini
961192313c
Fix cln rpc path for btcpayserver on regtest 2022-06-03 23:39:36 +02:00
nixbitcoin
cb295d1a16
joinmarket: 0.9.5 -> 0.9.6 2022-06-03 08:56:35 +00:00
Erik Arvstedt
c8d5cb2405
examples: improve Flakes-based VM
- Show login message
- Poweroff on shell exit
- Move to top of examples/README
2022-06-02 14:06:54 +02:00
Jonas Nick
32d2ded412
Merge fort-nix/nix-bitcoin#493: lndconnect-onion: Fix feature for custom operator names
cbf327c808 lndconnect-onion: fix for custom operator names (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    utACK cbf327c808

Tree-SHA512: 9088ecd2e73a8818f195a4acaa27c8a6fc6ca5b875881e65b3a715d2839c6261c58967acf1590429fa530477a6d2fcee2171347353c462d1bcfa62846a9182af
2022-06-02 11:36:23 +00:00
Erik Arvstedt
cbf327c808
lndconnect-onion: fix for custom operator names 2022-06-02 12:38:33 +02:00
Erik Arvstedt
1e94e891b2
flake: move VM to separate file
This simplifies the flake.
2022-06-01 22:12:50 +02:00
Erik Arvstedt
7233b054d9
flake: use new output format
The previous format is deprecated.
2022-06-01 22:12:47 +02:00
nixbitcoin
568d728e5c
joinmarket: put python-packages in alphabetical order 2022-06-01 12:37:38 +00:00
Jonas Nick
a3ff1351d9
update nixpkgs
btcpayserver: 1.5.1 -> 1.5.3
hwi: 2.1.0 -> 2.1.1
lndconnect: 0.2.0 -> 0.2.1
nbxplorer: 2.3.20 -> 2.3.26
2022-06-01 12:37:32 +00:00
Jonas Nick
636d508b50
spark-wallet: use nodejs 14 instead of 12 since latter is EOL 2022-06-01 12:37:28 +00:00
Jonas Nick
a99fad2235
Merge fort-nix/nix-bitcoin#491: clboss: 0.12 -> 0.13A
592acbff1d clboss: 0.12 -> 0.13A (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 592acbff1d

Tree-SHA512: 3522091ebfb577b0b12dfda8d0541598a7b5ce7227e1642b45f2beffd684a573b0b1cd3a914d9c3246b4dc9083a83d404000804629e5af277fb1a9e70792ecdc
2022-05-31 10:36:39 +00:00
Jonas Nick
592acbff1d
clboss: 0.12 -> 0.13A 2022-05-30 19:09:55 +00:00
Jonas Nick
95e4a3fa9e
Merge fort-nix/nix-bitcoin#487: Add feeadjust core lightning plugin
f9315db52c clightning/feeadjuster: add test (Erik Arvstedt)
1054e9a3b1 Add cln feeadjuster plugin (elsirion)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK f9315db52c
  jonasnick:
    ACK f9315db52c

Tree-SHA512: 878b5c2455d71cfd8503774f3f29fc36c7fc5337b583a850c4d944348e102a23de92aba6fadf4304cfd81a5684869f9c0b8cbe1673cf72b2b57f5846b2c73183
2022-05-30 15:44:20 +00:00
Erik Arvstedt
f9315db52c
clightning/feeadjuster: add test 2022-05-27 11:22:00 +02:00
elsirion
1054e9a3b1
Add cln feeadjuster plugin 2022-05-27 11:21:58 +02:00
Jonas Nick
ebaa9a3f2e
Merge fort-nix/nix-bitcoin#484: Update RTL
3755b3ebea rtl: add option `extraConfig` for nodes (Erik Arvstedt)
ff228a604d rtl: change `nodes` options (Erik Arvstedt)
beae9f8df7 clightning-rest: 0.7.0 -> 0.7.2 (Erik Arvstedt)
4c2d908a38 rtl: 0.12.2-beta -> 0.12.3-beta (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  nixbitcoin:
    ACK 3755b3ebea

Tree-SHA512: 21b413473792802a49694427dd488d7ba0575bb79297b8cd3d3e09707f0389fa4a65ed18eea11af167e1f42154f43685a7afc0829b769dea4b8d64007dcd7be5
2022-05-25 19:48:42 +00:00
Jonas Nick
df1585cb48
Merge fort-nix/nix-bitcoin#488: Update clightning-plugins
ae94665ad1 clightning: add `package` option (Erik Arvstedt)
041162d1e3 clightning-plugins: update to latest rev (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK ae94665ad1

Tree-SHA512: af83b9ee694fb85073715034d93572b7a21e4a256e790f3ebc512721e2b398faee5ee120b3878727ca82ba7ffaf3171af8a9529fc55e603920b85ffae1bc2402
2022-05-23 11:05:04 +00:00
Erik Arvstedt
ae94665ad1
clightning: add package option 2022-05-22 15:57:15 +02:00
Erik Arvstedt
041162d1e3
clightning-plugins: update to latest rev 2022-05-22 15:57:15 +02:00
Jonas Nick
19d44c6508
Merge fort-nix/nix-bitcoin#486: Minor improvements
ef93a9a8bd rtl: formatting (Erik Arvstedt)
571983a993 docs/services: improve lndconnect section (Erik Arvstedt)
9649785dd5 docs/configuration: improve formatting (Erik Arvstedt)
3d32c0afeb docs/configuration: clarify description (Erik Arvstedt)
107ee27be3 docs/configuration: improve wording (Erik Arvstedt)
e2721a9039 examples/configuration.nix: update system.stateVersion (Erik Arvstedt)
15288d58e1 lnd: rename var `mnemonic` -> `seed` (Erik Arvstedt)
84fe731c94 treewide: curl: exit with error status on HTTP errors (Erik Arvstedt)
63b3eec9cd push-release.sh: fix pushing to master branch (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK ef93a9a8bd

Tree-SHA512: 5031f6fbeb6c6a57a34f3d483bc100e0035ff382ef7a03ed600276756aa040d19513d28b8dbd9406d75c18b3f7776381e46a4b6c6b9a1a33ef6990b71d1da1a7
2022-05-20 11:51:21 +00:00
Erik Arvstedt
ef93a9a8bd
rtl: formatting 2022-05-20 13:28:45 +02:00
Erik Arvstedt
571983a993
docs/services: improve lndconnect section 2022-05-20 13:28:45 +02:00
Erik Arvstedt
9649785dd5
docs/configuration: improve formatting
Join paragraphs that refer to the same topic.
2022-05-20 13:28:44 +02:00
Erik Arvstedt
3d32c0afeb
docs/configuration: clarify description
It's not entirely clear what 'updating the secrets' means (it refers to
the previous step), so just remove this part.
2022-05-20 13:28:44 +02:00
Erik Arvstedt
107ee27be3
docs/configuration: improve wording 2022-05-20 13:28:44 +02:00
Erik Arvstedt
e2721a9039
examples/configuration.nix: update system.stateVersion 2022-05-20 13:28:42 +02:00
Erik Arvstedt
15288d58e1
lnd: rename var mnemonic -> seed
This matches lnd's terminology.
2022-05-17 13:19:38 +02:00
Erik Arvstedt
84fe731c94
treewide: curl: exit with error status on HTTP errors
This makes scripts fail early on request errors.
Previously, curl exited with status 0 when enountering HTTP error status
codes.
`-fsS` equals `--fail --silent --show-error`.
2022-05-17 13:19:38 +02:00
Erik Arvstedt
63b3eec9cd
push-release.sh: fix pushing to master branch 2022-05-17 13:19:37 +02:00
Jonas Nick
14dec60916
Merge fort-nix/nix-bitcoin#485: update nixpkgs
b2ac602b46 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK b2ac602b46

Tree-SHA512: 97e96501a8154953ce2edc63c5beb325944616ba3a6e5af4ccf9392db324708ae0642f75ce1e82347a97d3cf5b6762ecd543e8144fe46240a2c43e886a4b455b
2022-05-17 09:36:43 +00:00
Jonas Nick
b2ac602b46
update nixpkgs
clightning: 0.11.0.1 -> 0.11.1
2022-05-16 21:03:10 +00:00
Erik Arvstedt
3755b3ebea
rtl: add option extraConfig for nodes
Also define rtl config as a Nix attrset that is converted to JSON
2022-05-15 21:25:32 +02:00
Erik Arvstedt
ff228a604d
rtl: change nodes options
- Move option `rtl.nodes.{lnd,clightning}` -> `rtl.nodes.{lnd,clightning}.enable`
  This is required by the next commit.

- Move option `rtl.loop` -> `rtl.nodes.lnd.loop`

- Only enable loop when `nodes.lnd` is enabled
2022-05-15 21:25:32 +02:00
Erik Arvstedt
beae9f8df7
clightning-rest: 0.7.0 -> 0.7.2 2022-05-14 15:22:35 +02:00
Erik Arvstedt
4c2d908a38
rtl: 0.12.2-beta -> 0.12.3-beta 2022-05-14 15:22:35 +02:00
Jonas Nick
cae0ff448f
Merge fort-nix/nix-bitcoin#483: pkgs-unstable: inherit system from stable pkgs
472bcf1565 pkgs-unstable: inherit system from stable pkgs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 472bcf1565

Tree-SHA512: f27418e863196f43e86f332ba9c6ffdd548cb29076acfd1e3304945045e31c6edef3a9a164acd5f0fee877e83f1e4988dcba8055aff4cac87821301c43f030f2
2022-05-11 15:37:00 +00:00
Erik Arvstedt
472bcf1565
pkgs-unstable: inherit system from stable pkgs
Previously, `builtins.defaultSystem` was implicitly used.
This fixes NixOS system builds for systems other than `defaultSystem`.
2022-05-11 10:04:55 +02:00
Jonas Nick
24c3d68eee
Merge fort-nix/nix-bitcoin#481: services: set systemd list options as list values
e6bb281a88 services: set systemd list options as list values (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK e6bb281a88

Tree-SHA512: 1d2fa23de5903d32b5c0c64e362c0b21b566653dced1894c95409aed45f0a9d3a95cf1346482f0aa53da035907a12af199107b254acad820b44b87d3e88a37f7
2022-05-07 19:59:34 +00:00
Erik Arvstedt
e6bb281a88
services: set systemd list options as list values
This makes our list definitions mergeable with custom list values
set by users.
Previously, a module error ("value is a string while a list
was expected") was thrown instead.

This commit was partly auto-generated with this script:

#!/usr/bin/env ruby
Dir["**/*.nix"].each do |file|
  src = File.read(file)
  fixed = src.gsub(/ReadWritePaths *= *(.*?);/) do
    "ReadWritePaths = [ #{$1} ];"
  end
  File.write(file, fixed) if fixed != src
end
2022-05-07 20:37:02 +02:00
Jonas Nick
4df8d9404d
Merge fort-nix/nix-bitcoin#480: push-release.sh: add push to release branch
4b800605e0 add `release` branch (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 4b800605e0

Tree-SHA512: 0b4f0890fac71cba07fe86b7b5cf85b872aaebf8b293e5306ed3a328ffdb36e0c34b8594d920b645b6a9712a6c2a01d973193bceb1f0b1f0cb6452a8c583ef51
2022-05-06 14:54:30 +00:00
Erik Arvstedt
4b800605e0
add release branch
Use this as the default in the example flake.
2022-05-06 16:49:31 +02:00
Jonas Nick
2e537fbf99
Merge fort-nix/nix-bitcoin#477: Add standalone clightning-rest service, add lndconnect-onion for clightning
8e1ad6e3a8 docs/services: update Zeus usage section, add clightning (Erik Arvstedt)
20c0194ade readme: add hint about github table of contents button (Erik Arvstedt)
e2fee4bf1a lnd-rest-onion-service.nix: move to lndconnect-onion.nix, add clightning support (Erik Arvstedt)
acf5fe69ad add standalone `clightning-rest` service (Erik Arvstedt)
c30aa33c15 cl-rest: rename pkg to clightning-rest (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 8e1ad6e3a8

Tree-SHA512: 7d70648aa404fd9b452b6b015c68f72f24f284aae69f4d7df6e94167864d28aae0fca5642c9f6f469ce3ad9a2fd441d6b2de0a0178cc5b0c88ef1cd14bc3d104
2022-05-06 14:39:10 +00:00
Erik Arvstedt
8e1ad6e3a8
docs/services: update Zeus usage section, add clightning
The current Zeus version has native tor support, so Orbot is no longer required.
2022-05-06 16:26:40 +02:00
Erik Arvstedt
20c0194ade
readme: add hint about github table of contents button 2022-05-06 16:26:40 +02:00