Commit Graph

1962 Commits

Author SHA1 Message Date
Jonas Nick
6f72575932
Merge fort-nix/nix-bitcoin#675: test: use nixpkgs-unstable flake input for nix-bitcoin pkgs
afbd8a3cad test: use `nixpkgs-unstable` flake input for nix-bitcoin pkgs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    utACK afbd8a3cad

Tree-SHA512: ad5fba6cafff4acab4b63841b5376c0bc014eee9c40997b89ffbc52b1703453f7b064a7e61835b66f59136f6d5ea08670509d4e01085a972a46db3a7ec007648
2024-01-16 12:01:24 +00:00
Jonas Nick
b34bf78574
Merge fort-nix/nix-bitcoin#674: tests/hardened: fix test for slower hardware
98b16a1f6c tests/hardened: fix test for slower hardware (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    utACK 98b16a1f6c

Tree-SHA512: 04d51dcf1aa01f861dff0da3bd2bb65bba0046d53ab6849f930455c579be7a80d6444f9f45e2d17bf6dd946ad7c6b5a2e0e2b65ed64a9892d20dfd83e6c503fb
2024-01-16 11:58:23 +00:00
Jonas Nick
792e724897
Merge fort-nix/nix-bitcoin#673: Minor improvements
73d6d1e8ca dev: move mempool to `dev-features.sh` (Erik Arvstedt)
d61dc8b8d9 test/README: fix typos (Erik Arvstedt)
c1a7ab7b2f onion-services: fix markdown code formatting (Erik Arvstedt)
4347125344 nix-bitcoin: add example for option `pkgOverlays` (Erik Arvstedt)
7e0d54a19a docs/services: improve lndconnect-wireguard docs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 73d6d1e8ca

Tree-SHA512: 6a3348711e3f0d314935086eb081c6d98c2e5654740106d2e11954560ae7adce3d29a9435746eafbc3ead47d696ba48c4f492e2ca3f4673ff65a9e24b8cfac3a
2024-01-16 11:56:48 +00:00
Jonas Nick
b2e4adf368
Merge fort-nix/nix-bitcoin#670: update nixpkgs
3afe639215 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 3afe639215

Tree-SHA512: 915ef75d8a7ee19a85ee2ef83c885ff0b641f7b21eb5955f039c47bf983bba6c6cac6a3451414fb7c6013cd6289a16ab07dfc24c91ca8b1d70a126955c55d4de
2024-01-16 11:19:37 +00:00
Erik Arvstedt
73d6d1e8ca
dev: move mempool to dev-features.sh
The mempool dev cmd docs are too short for a dedicated file.
2024-01-15 23:27:18 +01:00
Erik Arvstedt
d61dc8b8d9
test/README: fix typos 2024-01-15 23:27:18 +01:00
Erik Arvstedt
afbd8a3cad
test: use nixpkgs-unstable flake input for nix-bitcoin pkgs
By using the `default` flake module for tests, `pkgsUnstable` in
`pkgs/default.nix` gets passed the `nixpkgs-unstable` flake input
instead of falling back to importing `nixpkgsPinned.nixpkgs-unstable`.

For some use cases this prevents importing `nixpkgs-unstable` twice
(once via the `nixpkgs-unstable` flake input, once via
`import nixpkgsPinned.nixpkgs-unstable`).
2024-01-15 23:15:36 +01:00
Erik Arvstedt
98b16a1f6c
tests/hardened: fix test for slower hardware 2024-01-15 23:12:06 +01:00
Erik Arvstedt
c1a7ab7b2f
onion-services: fix markdown code formatting 2024-01-15 23:05:26 +01:00
Erik Arvstedt
4347125344
nix-bitcoin: add example for option pkgOverlays 2024-01-15 23:05:26 +01:00
Erik Arvstedt
7e0d54a19a
docs/services: improve lndconnect-wireguard docs 2024-01-15 23:05:25 +01:00
Jonas Nick
3afe639215
update nixpkgs
bitcoind: 25.1 -> 26.0
clightning: 23.08.1 -> 23.11.2
elementsd: 22.1.1 -> 23.2.1
fulcrum: 1.9.7 -> 1.9.8
2024-01-15 10:32:22 +00:00
Jonas Nick
88c2a1ce55
Merge fort-nix/nix-bitcoin#669: Docs: fix small error in installation.md
fd0e129ecb Docs: fix small error in installation.md (JumbledUp)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK fd0e129ecb

Tree-SHA512: e3ebae299d17661a412d3362d756038830d241b266ad8cb406dd93725c9457e7e0f4af3f5d332b7815e8a0ab500218fa43f501006b748e7d7392a0bf74c5f780
2024-01-01 10:21:31 +00:00
JumbledUp
fd0e129ecb
Docs: fix small error in installation.md
"Migrating existing services to bitcoind" at the bottom of nix-bitcoin/docs/install.md should read "Migrating existing services to nix-bitcoin" since it links to the section of configuration.md called "Migrate existing services to nix-bitcoin"
2023-12-30 22:09:05 +00:00
Jonas Nick
243c221d64
Merge fort-nix/nix-bitcoin#666: joinmarket: remove custom secp256k1 package
e56ca3de6b joinmarket: remove custom secp256k1 package (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK e56ca3de6b

Tree-SHA512: 12f022042077247eb86446d256b601934dc790b0f4aacf84d85120dedcb74d03170eec294b49e41b6cc15101c8947f11f82761de8bfafcef023ea93d0ef8525e
2023-12-15 21:58:24 +00:00
Jonas Nick
e56ca3de6b
joinmarket: remove custom secp256k1 package
python-bitcointx 1.1.4 is compatible with libsecp256k1 0.4.0 in nixpkgs.
Joinmarket uses libsecp256k1 only through python-bitcointx.
2023-12-15 14:55:01 +00:00
Jonas Nick
a2e1478a7c
Merge fort-nix/nix-bitcoin#662: Update to NixOS 23.11
85bbdb857a python-bitcointx: 1.1.3 -> 1.1.4 (Erik Arvstedt)
1c07c5fa5c python-packages: add workaround to reenable requirements checking (Erik Arvstedt)
dc1033f1c8 python-packages/joinmarket: update (Erik Arvstedt)
de51f20ccb python-packages/clightning: update (Erik Arvstedt)
e82da35174 examples/deploy-krops: fix duplicate import error (Erik Arvstedt)
b110e2aea6 fetch-node-modules: provide CA certs (Erik Arvstedt)
770a4354b4 btcpayserver: fix PostgreSQL 15 user permissions (Erik Arvstedt)
9efcdaf8bb treewide: use `vendorHash` for golang drvs (Erik Arvstedt)
be2028f2e8 mempool: use `recommendedBrotliSettings` (Erik Arvstedt)
1676445a51 update to NixOS 23.11 (Erik Arvstedt)
e4cb004905 joinmarket: 0.9.9 -> 0.9.10 (nixbitcoin)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 85bbdb857a

Tree-SHA512: d23ac210d4c373a2a726debdf57d96f86adf551ee7f088d460e400446a48b5ae667c60ee7d36f6ec755f48c04d543e7287f2210941af8bc8940013c8ab36473e
2023-12-14 14:26:42 +00:00
Erik Arvstedt
85bbdb857a
python-bitcointx: 1.1.3 -> 1.1.4 2023-12-14 15:00:28 +01:00
Erik Arvstedt
1c07c5fa5c
python-packages: add workaround to reenable requirements checking 2023-12-14 14:53:10 +01:00
Erik Arvstedt
dc1033f1c8
python-packages/joinmarket: update
- Add `doCheck = false` and `pythonImportsCheck` where appropriate.
  This is good practice in general, but specifically works around a
  `buildPythonPackage` bug where the test phase fails due to a
  requirements check that is unrelated to testing.

- Enable tests for `jmbitcoin`.

- Patch some requirements. I've checked the release notes of the
  required deps for backwards compatibility.
2023-12-14 14:53:10 +01:00
Erik Arvstedt
de51f20ccb
python-packages/clightning: update 2023-12-14 14:51:12 +01:00
Erik Arvstedt
e82da35174
examples/deploy-krops: fix duplicate import error
`qemu-vm.nix` is already imported in `vm-config.nix` but under a
different path.
This causes an "already declared" error on NixOS 23.11.
2023-12-14 14:51:07 +01:00
Erik Arvstedt
b110e2aea6
fetch-node-modules: provide CA certs
Without this, the `npm ci` command in `fetchNodeModules` hangs.

It seems that npm didn't check certs previously, because these are
not availble in Nix build environments by default.
2023-12-14 14:50:31 +01:00
Erik Arvstedt
770a4354b4
btcpayserver: fix PostgreSQL 15 user permissions
Since PostgreSQL 15, DB users need to be DB owners to be able to create tables.

We can't use the new `ensureDBOwnerhip` NixOS option [1] to set this up,
because it requires the PostgreSQL user name and the database name to be
identical, which is not the case for btcpayserver.

Instead, we manually issue a PostgreSQL admin statement similar to the one
used by `ensureDBOwnerhip`.

This method of setting up the user is also compatible with older
PostgreSQL versions that come with older NixOS `system.stateVersion`s.

[1] https://github.com/NixOS/nixpkgs/pull/266270
2023-12-12 11:22:38 +01:00
Erik Arvstedt
9efcdaf8bb
treewide: use vendorHash for golang drvs
`vendorSha256` has been deprecated.
2023-12-12 11:22:38 +01:00
Erik Arvstedt
be2028f2e8
mempool: use recommendedBrotliSettings 2023-12-12 11:22:38 +01:00
Erik Arvstedt
1676445a51
update to NixOS 23.11 2023-12-12 11:22:38 +01:00
nixbitcoin
e4cb004905
joinmarket: 0.9.9 -> 0.9.10 2023-12-02 23:01:15 +01:00
Jonas Nick
1d73b21f10
Merge fort-nix/nix-bitcoin#661: update nixpkgs
457f066e08 tests/trustedcoin: fix (Erik Arvstedt)
f06ee98435 update nixpkgs (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 457f066e08

Tree-SHA512: 7c1529dd8830187c0ee9adfb585747fc41300dc7efe1b8a3304ee6b5903034d8296eccecc744d38b7333a06e4f2c201dbe33d000d8360e030d1e2d16879f9513
2023-11-29 09:28:15 +00:00
Erik Arvstedt
457f066e08
tests/trustedcoin: fix
Sometimes trustedcoin outputs `tip: 0`.
Check for `returning block` instead.
2023-11-28 18:33:27 +00:00
Jonas Nick
f06ee98435
update nixpkgs
btcpayserver: 1.11.6 -> 1.11.7
electrs: 0.9.13 -> 0.10.1
fulcrum: 1.9.2 -> 1.9.7
2023-11-28 18:33:18 +00:00
Jonas Nick
24151b63f8
Merge fort-nix/nix-bitcoin#659: fix pkgconfig -> pkg-config rename
bb17457bc0 fix pkgconfig -> pkg-config rename (Chris Guida)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK bb17457bc0.

Tree-SHA512: ec23c460f53a2251885dcd5cb664033519ca490c519fada888f299e3a04e63fbd1f34e7723b0ee2ecfb4fb666d8528408ebfc1d8461975371faa0d3c1d5584c3
2023-11-13 08:06:18 +00:00
Chris Guida
bb17457bc0 fix pkgconfig -> pkg-config rename 2023-11-10 15:34:35 -06:00
Jonas Nick
a1eacce676
Merge fort-nix/nix-bitcoin#658: presets/wireguard: make compatible with secure-node preset
e784e0ceb8 presets/wireguard: make compatible with `secure-node` preset (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    utACK e784e0ceb8

Tree-SHA512: a5506e487b01b78f9c420314980bb837079c2960a076f1fbf665db26b5325d9e96cef0743a9f66ab681dfc42fe6fabcee736519013c4c4d164b7d0922ebe8edf
2023-11-05 09:50:42 +00:00
Jonas Nick
1090675516
Merge fort-nix/nix-bitcoin#505: Add mempool
1de259485b mempool: add module (Erik Arvstedt)
f0bf94cc5a mempool: init at 2.5.0 (Erik Arvstedt)
8cdedac046 bitcoind-rpc-public-whitelist: add `getindexinfo` (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 1de259485b

Tree-SHA512: f3cbe1eaac6994c6b05f2e560bb2dce564236bcd650e54e4d80ca2b15e20b1d9aa5a9a9c6b9e46ab4f0cf64e8864cbafe884190260c43ba6a1201513605c24f0
2023-11-05 09:41:00 +00:00
Erik Arvstedt
e784e0ceb8
presets/wireguard: make compatible with secure-node preset
Disable Tor enforcement set by the secure-node preset.
2023-11-01 18:29:32 +01:00
Erik Arvstedt
1de259485b
mempool: add module 2023-10-31 13:44:04 +01:00
Erik Arvstedt
f0bf94cc5a
mempool: init at 2.5.0 2023-10-30 11:58:24 +01:00
Erik Arvstedt
8cdedac046
bitcoind-rpc-public-whitelist: add getindexinfo 2023-10-30 11:58:24 +01:00
Jonas Nick
8a8f32a4fa
Merge fort-nix/nix-bitcoin#655: examples/flake.nix: minor improvements
742fd8fdd0 examples/flake.nix: add `inputs.nixpkgs` (Erik Arvstedt)
89ea349312 examples/flake.nix: add comments and extra service (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 742fd8fdd0

Tree-SHA512: 7879d2c4cfa95db7b0310d402f6d8dc78fad1667f6a1021f466b8307e6f62235d113df70cc0932695fd3d80d7b141e7463e03ad45aac93c7e655c59c12c90a2f
2023-10-23 12:35:38 +00:00
Jonas Nick
4c96a8deba
Merge fort-nix/nix-bitcoin#656: update nixpkgs: bitcoin 24.1 -> 25.1
a66c9992d3 tests/trustedcoin: fix test (Erik Arvstedt)
8e2010c1b3 update nixpkgs (Jonas Nick)
2804d4ada0 Revert "bitcoin: replace nixpkgs package with bitcoin{,d} 24.1" (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK a66c9992d3

Tree-SHA512: 6a30a86d64ad1a178ab091f3300291d711cedacd35b056f91f26b9976b83f556a1f7872a32f74c3fd545396f303b4475b9a16dd9c3043914586c5ac615519d59
2023-10-23 12:32:19 +00:00
Erik Arvstedt
a66c9992d3
tests/trustedcoin: fix test
Sometimes the trustedcoin plugin prevents clightning from starting up
in an offline environment.
2023-10-23 12:12:29 +00:00
Erik Arvstedt
742fd8fdd0
examples/flake.nix: add inputs.nixpkgs
To make this template look more like a regular system flake.
2023-10-23 11:47:34 +02:00
Jonas Nick
8e2010c1b3
update nixpkgs
bitcoin: 24.1 -> 25.1
bitcoind: 24.1 -> 25.1
2023-10-23 09:37:40 +00:00
Jonas Nick
2804d4ada0
Revert "bitcoin: replace nixpkgs package with bitcoin{,d} 24.1"
This reverts commit 3650d4befe.
2023-10-23 08:58:10 +00:00
Erik Arvstedt
89ea349312
examples/flake.nix: add comments and extra service
Like in importable-configuration.nix
2023-10-19 09:48:50 +02:00
Jonas Nick
1852305b13
Merge fort-nix/nix-bitcoin#654: update nixpkgs
1fad7c730b update nixpkgs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 1fad7c730b

Tree-SHA512: 41cd3482e7878daa1152be2e982a2c8a07c464127d670e0e70ab0f80e6ac819b5714c8162efa3b35f7a9bd2633f0a25508044c1b7f60e6a34fdf07f3c0e07333
2023-10-18 12:20:22 +00:00
Erik Arvstedt
1fad7c730b
update nixpkgs
btcpayserver: 1.11.4 -> 1.11.6
fulcrum: 1.9.1 -> 1.9.2
lnd: 0.16.3-beta -> 0.17.0-beta
nbxplorer: 2.3.65 -> 2.3.66

Includes fix for curl CVE-2023-38545 (https://github.com/NixOS/nixpkgs/pull/260381)
2023-10-17 21:10:37 +02:00
Jonas Nick
3e82a56a3b
Merge fort-nix/nix-bitcoin#652: rtl: 0.14.0 -> 0.14.1
b63798ff46 rtl: 0.14.0 -> 0.14.1 (Erik Arvstedt)
c14ebd230c clighting-rest: 0.10.5 -> 0.10.7 (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK b63798ff46

Tree-SHA512: e5f8abcbf1f087d58a6e9df790b8a97bf3543736e8e832d0911172cf357fa158e178ec4bdd3374e82163434ba6c8e030643332b94a1cfa3346e4396cf2a22ac8
2023-10-09 08:03:01 +00:00
Jonas Nick
749901b923
Merge fort-nix/nix-bitcoin#653: Revert "clightning: don't cleanup socket on startup"
fc1466e743 Revert "clightning: don't cleanup socket on startup" (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK fc1466e743

Tree-SHA512: e4139ef9163fe371964cb8ab668f70dc414ecc5169e3d5d7a0637ef61493d51f1416d878abd21b28d5763e089e00ff10a2e8f30103b488871470ad31dd387025
2023-10-09 07:59:33 +00:00