Commit Graph

1713 Commits

Author SHA1 Message Date
Greg Shuflin
9a7e5e1921 Patch to prevent chmod 2022-09-20 19:34:12 -07:00
Jonas Nick
755da16a1b
Merge fort-nix/nix-bitcoin#529: ShellCheck on scripts generated by nix
f3f8d650ab shellcheck: fix the lint warnings for other generated scripts (Otto Sabart)
acd341426a shellcheck: prevent globbing and word splitting in package shell scripts (Otto Sabart)
c3b97e6728 tests: add `shellcheckServices` (Erik Arvstedt)
01fa900633 shellcheck: fix setup-secrets.sh, spark-wallet (Erik Arvstedt)
ee15837244 shellcheck: prevent globbing and word splitting in unit shell scripts (Otto Sabart)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK f3f8d650ab
  jonasnick:
    Concept ACK f3f8d650ab

Tree-SHA512: b7a8ae1e8db57e6bb1285832cdd52414913339344e6c6c72621e48404887ae214ed839364d3f2d272cc4b339812ee032e73040b60e6a9f1b9d189ecbae745772
2022-09-13 15:03:58 +00:00
Otto Sabart
f3f8d650ab
shellcheck: fix the lint warnings for other generated scripts 2022-09-12 21:00:00 +02:00
Otto Sabart
acd341426a
shellcheck: prevent globbing and word splitting in package shell scripts 2022-09-12 21:00:00 +02:00
Erik Arvstedt
c3b97e6728
tests: add shellcheckServices 2022-09-12 21:00:00 +02:00
Erik Arvstedt
01fa900633
shellcheck: fix setup-secrets.sh, spark-wallet 2022-09-12 21:00:00 +02:00
Otto Sabart
ee15837244
shellcheck: prevent globbing and word splitting in unit shell scripts 2022-09-12 21:00:00 +02:00
Jonas Nick
4e63301ac3
Merge fort-nix/nix-bitcoin#546: Update nixpkgs
63f8b74026 pyln-client: add patch that fixes plugins (Jonas Nick)
5255c7e8bc pyln-client: remove pkg patch that has become unnecessary (Jonas Nick)
c165836fd1 bitcoind: add "getdeploymentinfo" to public rpc whitelist (Jonas Nick)
623c238b16 clightning-plugins: remove commando pkg and module (Jonas Nick)
33144262ec clightning-plugins: bump ver of pyln-client required by prometheus (Jonas Nick)
9c766df16a Revert "clightning: fix build" (Jonas Nick)
b57e7466fb update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 63f8b74026

Tree-SHA512: 699ce5179ee202218933424ac3fe746a405700daccad78109d8118013cba6d64d40b07a87430281cbde96438250a05b03be0e44ebb69d85e2d41ec3ae57d6c7e
2022-09-07 09:42:43 +00:00
Jonas Nick
ff04de6972
Merge fort-nix/nix-bitcoin#545: test/lib/create-git-repo: fix variable quoting
49e30f7172 test/lib/create-git-repo: fix empty var expansion (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 49e30f7172

Tree-SHA512: 321f01bd8674e7cc91718e9799e3175cb640feb42ebac90588a60cdbe160b705aac4effa4cc229adc41c062c3cdf7ad90317a4dde90665d71141016faf2ce43a
2022-09-07 09:41:19 +00:00
Jonas Nick
63f8b74026
pyln-client: add patch that fixes plugins
Without this patch, the summary and feeadjuster plugins crash on startup.
2022-09-07 09:33:00 +00:00
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
5255c7e8bc
pyln-client: remove pkg patch that has become unnecessary 2022-09-07 08:44:52 +00:00
Jonas Nick
c165836fd1
bitcoind: add "getdeploymentinfo" to public rpc whitelist
This is required by lnd 0.15.1.
2022-09-07 08:44:52 +00:00
Jonas Nick
623c238b16
clightning-plugins: remove commando pkg and module
clightning 0.12.0 ships with a reimplementation of the commando plugin that is
incompatible with the commando module that existed in nix-bitcoin.
2022-09-07 08:44:52 +00:00
Jonas Nick
33144262ec
clightning-plugins: bump ver of pyln-client required by prometheus 2022-09-07 08:44:51 +00:00
Jonas Nick
9c766df16a
Revert "clightning: fix build"
This reverts commit 321e8ba06e which is not
necessary anymore due to the nixpkgs update.
2022-09-07 08:44:51 +00:00
Jonas Nick
b57e7466fb
update nixpkgs
btcpayserver: 1.6.9 -> 1.6.10
lnd: 0.15.0-beta -> 0.15.1-beta
2022-09-07 08:44:47 +00: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