Commit Graph

1762 Commits

Author SHA1 Message Date
William Casarin
570e271695 clightning-plugins: bump to latest git
Signed-off-by: William Casarin <jb55@jb55.com>
2022-01-22 17:01:38 -08:00
Jonas Nick
f8ce24647e
Merge fort-nix/nix-bitcoin#444: fetch-release: add missing homedir to gpg command
296e103228 fetch-release: add missing homedir to gpg command (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 296e103228

Tree-SHA512: 722f80fc16d85c866af9a6d9094ca5edbb1955dc5d455300ba07fc57c66a787c91cadf534773ebaec744c577238226668f34f9c1f2080fa563b07d4161e1d6e8
2022-01-21 15:49:57 +00:00
Jonas Nick
296e103228
fetch-release: add missing homedir to gpg command 2022-01-21 14:20:38 +00:00
Jonas Nick
c5c6f1e75e
Merge fort-nix/nix-bitcoin#443: Update nixpkgs
5b7bc2d6ff update nixpkgs{-unstable} (Jonas Nick)
ffabad225b spark-wallet: switch from nodejs 10 to 12 (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 5b7bc2d6ff

Tree-SHA512: 9b3b7ed53f15bcf98bbd4aac5f08a7d9b62bb86f88ea33e8d89fa4a81613222cc80da9fad784dcfa00a732b44b0074a0adf07908004b95423f4b3d2e940cf986
2022-01-21 13:49:57 +00:00
Jonas Nick
5b7bc2d6ff
update nixpkgs{-unstable}
electrs: 0.9.3 -> 0.9.4
2022-01-20 21:59:13 +00:00
Jonas Nick
ffabad225b
spark-wallet: switch from nodejs 10 to 12
nixpkgs starts marking nodejs 10 as insecure because it is end of life.
2022-01-20 21:59:01 +00:00
Jonas Nick
b9f9c202f8
Merge fort-nix/nix-bitcoin#441: lnd: improve service initialization
d8af0aca02 lnd: improve service initialization (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  nixbitcoin:
    utACK d8af0aca02
  jonasnick:
    ACK d8af0aca02

Tree-SHA512: 4c775362a63c6307dcb2f2765d367c8e35c707f18ca6b898f8860daa80934dd58e58aca852ae1fe3b29a43227b3cb1374225fe1ca60f8a4384b32da4470affe0
2022-01-19 19:46:23 +00:00
Erik Arvstedt
d8af0aca02
lnd: improve service initialization
- Use systemd startup notification.
- Use new option `--wallet-unlock-password-file` instead of
  manual unlocking.
2022-01-15 22:49:05 +01:00
Jonas Nick
f469033f6d
Merge fort-nix/nix-bitcoin#440: joinmarket: fix fidelity bond default values
40c5f63f04 joinmarket: fix fidelity bond default values (nixbitcoin)

Pull request description:

ACKs for top commit:
  jonasnick:
    utACK 40c5f63f04

Tree-SHA512: fb19c1b82eb8a8c497fcfd904b1bf372a5734f55deda0a34502ef49a4fb49fd7d92409602a907af938ea2138eec244958cae2e6cde35a94ef091dc93d8058842
2022-01-13 16:31:02 +00:00
nixbitcoin
40c5f63f04
joinmarket: fix fidelity bond default values 2022-01-11 11:05:42 +00:00
Jonas Nick
ed42834a88
Merge fort-nix/nix-bitcoin#437: bitcoind: fix error when defining passwordHMAC for RPC users
bf92d6094d bitcoind: fix error when defining passwordHMAC for RPC users (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK bf92d6094d

Tree-SHA512: 3a92c116c7e85cb03abad9b2d0be39c48be237da4a7ff2b6c20d27e9295da726b3de2d7e2298925b4ae20d7bbd8348529f4d2ec781fb8eda3338c9a06e9931a6
2022-01-07 21:30:55 +00:00
Erik Arvstedt
bf92d6094d
bitcoind: fix error when defining passwordHMAC for RPC users 2022-01-07 03:32:07 +01:00
Jonas Nick
5a24f2afb2
Merge fort-nix/nix-bitcoin#435: run-tests: fix vm cmd
98bc0917d7 run-tests: fix `vm` cmd (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 98bc0917d7

Tree-SHA512: c08810fbddac6493c1c8655abebca557a3d096b570598c0d97dfda5a31c864f1b7abc531536f197e1a7a093be5b39b3d9de4b64f8d019814e706080a5c435726
2022-01-04 21:59:09 +00:00
Erik Arvstedt
98bc0917d7
run-tests: fix vm cmd
Previously, qemu failed with error
`restrict=on : Parameter 'restrict' expects 'on' or 'off'`
due to the trailing space after `on`.
2022-01-04 22:30:35 +01:00
Jonas Nick
4d0e196a90
Merge fort-nix/nix-bitcoin#434: update nixpkgs{,-unstable}
1f45f7351e update nixpkgs{,-unstable} (Jonas Nick)
53a9f136b9 lib: allow syscall `get_mempolicy` in default seccomp filter (Erik Arvstedt)
a2c01e5a56 update-flake: fix attribute path of pinned (Jonas Nick)
bb9f0b54ca spark-wallet: use HTTPS instead of SSH for Github (nixbitcoin)
906b7f83ff rtl: 0.11.2 -> 0.12.0 (nixbitcoin)
2a7630e6f4 cl-rest: 0.6.0 -> 0.6.1 (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 1f45f7351e

Tree-SHA512: e96bb396558417c36c7dfcc8ac3f3a6b09b2453627d7c454bf948813c7a7fc82475d8579d485492c48aad44de4fd0ddd00dc73fc588f4e69b1eaae45bd6d040a
2022-01-02 13:48:57 +00:00
Jonas Nick
1f45f7351e
update nixpkgs{,-unstable}
btcpayserver: 1.3.6 -> 1.3.7
elementsd: 0.21.0 -> 0.21.0.1
lightning-loop: 0.15.0-beta -> 0.16.0-beta
lightning-pool: 0.5.1-alpha -> 0.5.3-alpha
2022-01-01 20:15:10 +00:00
Erik Arvstedt
53a9f136b9
lib: allow syscall get_mempolicy in default seccomp filter
This syscall is required by an upcoming version of btcpayserver.
Because it is generally safe, we can allow it for all services.
2022-01-01 20:13:42 +00:00
Jonas Nick
a2c01e5a56
update-flake: fix attribute path of pinned
This was missed in d69524143b.
2022-01-01 20:12:47 +00:00
nixbitcoin
bb9f0b54ca
spark-wallet: use HTTPS instead of SSH for Github 2022-01-01 19:12:20 +01:00
nixbitcoin
906b7f83ff
rtl: 0.11.2 -> 0.12.0 2021-12-30 14:29:29 +00:00
nixbitcoin
2a7630e6f4
cl-rest: 0.6.0 -> 0.6.1 2021-12-30 14:29:22 +00:00
Jonas Nick
6d4178f935
Merge fort-nix/nix-bitcoin#432: Improve flake
6be3fb3e77 flake: provide a single NixOS module (Erik Arvstedt)
d69524143b flake: remove nonstandard top-level flake attrs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 6be3fb3e77

Tree-SHA512: 78a41366407fc696156322600f596d4dfb12899c089503d330847ae175cfb7825689bb3888632ec80baff8a50efe037f4a5c33ded3220bcafa54b87b4f311528
2021-12-27 20:15:35 +00:00
Erik Arvstedt
6be3fb3e77
flake: provide a single NixOS module
Instead of providing two NixOS modules (one for using system pkgs,
one for using locked pkgs), provide a single module with option
`useVersionLockedPkgs`.

This fixes that all nix-bitcoin options are displayed twice
on search.nixos.org:
https://search.nixos.org/flakes?type=options&query=clightning
2021-12-27 16:59:14 +01:00
Erik Arvstedt
d69524143b
flake: remove nonstandard top-level flake attrs
Silences warnings in `nix flake check`.

- Define `mkNbPkgs` under attr `lib`.
  `lib` still triggers a warning, but it is expected to be a standard
  flake attr in a future Nix release.

- Define `nbPkgs` under attr `legacyPackages`.
  This also has the advantage to make its contents more easily
  accessible via the nix CLI. Example:
  nix eval nix-bitcoin#nbPkgs.modulesPkgs.clightning.version
2021-12-27 16:59:14 +01:00
Jonas Nick
dc382b8b67
Merge fort-nix/nix-bitcoin#431: Improve Pkgs
a31d07d8bf ci: update container image for modules tests (Erik Arvstedt)
bc7d3a2ed7 fetch-release: check that only one key is imported (Erik Arvstedt)
5ab85cb2a5 pkgs: add `meta` attr (Erik Arvstedt)
602281b132 rtl, cl-rest: add /bin to pkg output (Erik Arvstedt)
f4872f3334 spark-wallet: use node package lockfile (Erik Arvstedt)
3091b0a4fb cl-rest: use node package lockfile (Erik Arvstedt)
fbfb61210a rtl: use node package lockfile (Erik Arvstedt)
d296b2d1fb charge-lnd: remove unneeded use of `literalExample` (Erik Arvstedt)
f13ffe0146 run-tests: make `nixosSearch` compatible with `--copy-src` (Erik Arvstedt)
2069f62abc krops: -> 1.26.2 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  nixbitcoin:
    reACK a31d07d8bf

Tree-SHA512: 9fcc031b2bc8a56181fa0eae84c4809d896070bca5782f6b15a79e7d3545c77b8d436f512f709a203bcead81afe3293167dd8757635d6aeb5e5c320f106b6a83
2021-12-19 19:14:19 +00:00
Erik Arvstedt
a31d07d8bf
ci: update container image for modules tests
nixos/nix:latest has switched to Nix 2.5, but we should track
2.3.x, the default on NixOS stable.
2021-12-15 15:44:56 +01:00
Erik Arvstedt
bc7d3a2ed7
fetch-release: check that only one key is imported
Co-authored-by: nixbitcoin <nixbitcoin@i2pmail.org>
2021-12-15 15:44:55 +01:00
Erik Arvstedt
5ab85cb2a5
pkgs: add meta attr
Also add more detailed `enable` option descriptions.
2021-12-15 14:39:31 +01:00
Erik Arvstedt
602281b132
rtl, cl-rest: add /bin to pkg output 2021-12-15 10:58:04 +01:00
Erik Arvstedt
f4872f3334
spark-wallet: use node package lockfile 2021-12-15 10:58:04 +01:00
Erik Arvstedt
3091b0a4fb
cl-rest: use node package lockfile 2021-12-15 10:58:04 +01:00
Erik Arvstedt
fbfb61210a
rtl: use node package lockfile 2021-12-15 10:58:04 +01:00
Erik Arvstedt
d296b2d1fb
charge-lnd: remove unneeded use of literalExample 2021-12-15 10:58:04 +01:00
Erik Arvstedt
f13ffe0146
run-tests: make nixosSearch compatible with --copy-src 2021-12-15 10:58:04 +01:00
Erik Arvstedt
2069f62abc
krops: -> 1.26.2
Includes 9fc8cbf8e8

Add krops/fetch-release.sh
2021-12-14 19:52:17 +01:00
Jonas Nick
2aeee22251
Merge fort-nix/nix-bitcoin#429: Add nixos-search support
5e59c784ed flake: remove internal pkg `netns-exec` from packages (Erik Arvstedt)
1ef40ac230 ci: add flake test (Erik Arvstedt)
d3c8d7bd6f .cirrus.yml: refactor (Erik Arvstedt)
26a53f0d59 ci: simplify test (Erik Arvstedt)
0fd3be5343 move ci/ to test/ (Erik Arvstedt)
eaf98f92db test: add test `nixosSearch` (Erik Arvstedt)
77d8c00c53 run-tests.sh: extract `checkFlakeSupport` (Erik Arvstedt)
96df81a4d0 run-tests: move `flake` next to other tests (Erik Arvstedt)
bbebd0b383 treewide: remove invalid docbook XML from option descriptions (Erik Arvstedt)
3681f118f7 nix-bitcoin.nix: add `defaultText` (automatic) (Erik Arvstedt)
d24c029435 treewide: add `defaultText` (manual) (Erik Arvstedt)
f0096371bf btcpayserver: expand `nbPkgs` in option defaults (Erik Arvstedt)
349f904e79 secrets: use assertion instead of error in default value (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  nixbitcoin:
    reACK 5e59c784ed

Tree-SHA512: affecb3acd0cc5191c8225fd61a3c0869620c307fbdf02683637d1aa6ef4ea889b420496639046391e23ae2506a9cb2d9d2e6cfc0cb281e8c20f00d5508fc644
2021-12-13 21:19:47 +00:00
Erik Arvstedt
5e59c784ed
flake: remove internal pkg netns-exec from packages 2021-12-12 16:21:12 +01:00
Erik Arvstedt
1ef40ac230
ci: add flake test
- Check flake
- Check nixos-search doc generation
2021-12-12 16:21:12 +01:00
Erik Arvstedt
d3c8d7bd6f
.cirrus.yml: refactor
Required by the following commit.
2021-12-12 16:21:12 +01:00
Erik Arvstedt
26a53f0d59
ci: simplify test
Remove obsolete features that were required for pkgsUnstable.
2021-12-12 16:21:11 +01:00
Erik Arvstedt
0fd3be5343
move ci/ to test/ 2021-12-12 16:21:11 +01:00
Erik Arvstedt
eaf98f92db
test: add test nixosSearch
This checks that creating module docs for search.nixos.org succceeds.
Errors can happen when complex `default` values can't be evaluated
or on malformed Docbook XML in descriptions.
2021-12-12 16:21:02 +01:00
Erik Arvstedt
77d8c00c53
run-tests.sh: extract checkFlakeSupport
Required by the following commit.
2021-12-12 16:20:40 +01:00
Erik Arvstedt
96df81a4d0
run-tests: move flake next to other tests 2021-12-12 16:20:40 +01:00
Erik Arvstedt
bbebd0b383
treewide: remove invalid docbook XML from option descriptions
NixOS will soon use CommonMark Markdown for option descriptions.
We can then switch back the old, slightly clearer bracket syntax.
2021-12-12 16:20:40 +01:00
Erik Arvstedt
3681f118f7
nix-bitcoin.nix: add defaultText (automatic)
This enables generating module option documentation.

This commit was genereated by running the following script inside the
repo root dir:

def add_default_text(file)
  src = File.read(file)
  src2 = src.gsub(/( = mkOption\s+\{[^{]*?)(\n\s+default = )(.*?);$(.*?\})/m) do |str|
    pre, defaultVar, default, post = Regexp.last_match.captures
    replacement =
      if !post.include?('defaultText =')
        if default =~ /\bpkgs\b/
          defaultText = default.lines.length == 1 ? default : "(See source)"
          "#{pre}#{defaultVar}#{default};#{defaultVar.sub('default', 'defaultText')}#{defaultText.inspect};#{post}"
        end
      end
    replacement or str
  end
  File.write(file, src2) if src2 != src
end

Dir["modules/**/*.nix"].each do |f|
  next if File.basename(f) == "nix-bitcoin.nix"
  add_default_text f
end
2021-12-12 16:20:39 +01:00
Erik Arvstedt
d24c029435
treewide: add defaultText (manual)
This enables generating module option documentation.

Add `defaultText` to options where the default value can't be
evaluated during metadata generation.
2021-12-12 16:18:14 +01:00
Erik Arvstedt
f0096371bf
btcpayserver: expand nbPkgs in option defaults
Required by commit `nix-bitcoin.nix: add `defaultText` (automatic)`.
2021-12-11 13:27:51 +01:00
Erik Arvstedt
349f904e79
secrets: use assertion instead of error in default value
This enables generating module option documentation.
2021-12-11 13:27:48 +01:00
Jonas Nick
1b3d3620fb
Merge fort-nix/nix-bitcoin#430: NixOS 21.11
2f0f1ec15a hardened-extended: define kernelParams as separate strings (Erik Arvstedt)
71e9864060 netns-isolation: add compatibility with 21.11 (Erik Arvstedt)
8f641756ce tests: add TODO-EXTERNAL (Erik Arvstedt)
b2f7a80f9f tests: add compatibility with 21.11 (Erik Arvstedt)
88fa33479f clightning-plugins: update prometheus-client version pin (nixbitcoin)
c9c2104009 klein: use from upstream, update jmclient version pin (nixbitcoin)
048b49edae pyln-proto: add copy of base58 2.1.0 (nixbitcoin)
b5984a603c joinmarket: 0.9.3 -> 0.9.4 (nixbitcoin)
8433933251 node2nix composition: add writeShellScript (nixbitcoin)
6b725157e1 clboss: sslSupport -> opensslSupport (nixbitcoin)
1a8e7d6348 clightning: re-enable seccomp filtering (nixbitcoin)
16f5aa0561 update to NixOS 21.11 (nixbitcoin)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 2f0f1ec15a
  jonasnick:
    ACK 2f0f1ec15a

Tree-SHA512: 0685f94f0bc2ab64faa8679e2b579e6f2f1e96809ff00b61083b89bd7367ac990ddc1221698ee0e6729303c2a9a120cd460f32aba4f16ac5beeada8b70b6ea5b
2021-12-10 22:15:36 +00:00