Commit Graph

395 Commits

Author SHA1 Message Date
Erik Arvstedt 7dd5f01527
lightning-charge: 0.4.7 -> 0.4.14 2020-01-15 23:09:08 +00:00
Jonas Nick 8eb2346358
elementsd 0.18.1.1 -> 0.18.1.3 2020-01-13 08:23:19 +00:00
Jonas Nick d68b77c0ca
spark-wallet 0.2.9 -> 0.2.12 2020-01-13 08:23:19 +00:00
Jonas Nick 4e7b67d5e7
Update nixpkgs 2020-01-13 08:23:11 +00:00
Erik Arvstedt b1e13e9415
simplify secrets file format
Each secret file to be deployed is now backed by one local file.
This simplifies 'setup-secrets' and the secret definitions.
Also, with the old format it was not possible to add new secrets
to secrets.nix in a simple way.

Old secrets are automatically converted to the new format when running
nix-shell.

Using the new option 'nix-bitcoin.secrets', secrets are now directly
defined by the services that use them.
2020-01-13 00:25:11 +01:00
Erik Arvstedt 10d6b04ac8
support enabling clightning and lnd simultaneously
Needed for testing.
2020-01-12 20:02:04 +01:00
Erik Arvstedt cd5ed39b9c
lnd: add cli option 2020-01-12 20:02:02 +01:00
Erik Arvstedt 1833b15888
clightning: add cli option
An executable is more robust to use than shell aliases.

This is also a preparation for commit 'add module test' because the
NixOS testing framework makes interactive aliases hard to use: It
unsets 'PS1' which is used by programs/bash/bash.nix to detect
interactive shells.
2020-01-12 20:02:02 +01:00
Erik Arvstedt 6447694214
add generate-secrets pkg
generate-secrets.sh will also be used in generate-secrets.nix, so DRY
its dependency definitions.
2020-01-12 20:02:01 +01:00
Erik Arvstedt cd0fd6926b
don't copy secret files to store during nixops deployment 2020-01-12 20:02:00 +01:00
Erik Arvstedt 7e021a2629
simplify overlay.nix
Move pkg definitions to pkgs/default.nix.
This allows us to just import the pkgs in overlay.nix and get rid of
the filtering to exclude the modules.
2020-01-09 10:43:29 +01:00
Jonas Nick 5575878aad
Update nixpkgs 2019-11-18 23:25:32 +00:00
Jonas Nick ab35dc29eb
Update hwi 1.0.1 -> 1.0.3
Also remove unstable hwi build from travis because hwi requires mnemonic
<0.19.0 but nixpkgs unstable has 0.19.0.
2019-11-17 14:20:47 +00:00
Jonas Nick 44372e764f
Update nixpkgs 2019-11-16 21:47:06 +00:00
Erik Arvstedt 39885d37c1
banlist: simplify script, remove package
We're now directly using Greg's unmodified banlist which
simplifies the update process.

The banlist package with its dependency on the bitcoin datadir path is only
relevant for internal use within nix-bitcoin, so we can safely remove
it.

We're now using the bitcoin-cli from `services.bitcoind.package`.

Fixes #129
2019-11-12 19:42:33 +01:00
Erik Arvstedt 46edb39d2f
Add content hashes for pinned channels 2019-11-11 18:45:17 +01:00
Jonas Nick 6ba4a43193
Fix release.nix.patch for our nixops 2019-11-10 21:33:26 +00:00
Erik Arvstedt cfafcb5d32
Fix virtualbox deployment for 19.09
Without this, starting the virtualbox guest service fails during machine activation.
This is due to an incompatible NixOS machine base image.
Fix this by using an updated version of nixops.
2019-11-10 21:06:17 +01:00
Jonas Nick 26d2e11a6b
Update to NixOS 19.09 2019-10-28 20:58:57 +00:00
Jonas Nick 1d022f2017
Remove PyQt dependency from liquid-swap tool because it doesn't work with NixOs 19.09 and we don't need it anyway 2019-10-27 16:48:26 +00:00
William Casarin a152c19945 spark-wallet: 0.2.8 -> 0.2.9 2019-10-18 00:34:39 +02:00
Jonas Nick c8448b8c4a
Merge #120: Update nixpkgs
c5024d0f15 Add liquid-swap tool to CI (Jonas Nick)
29e612d3bd Remove spark-wallet with unstable from nixpkgs because it doesn't work (Jonas Nick)
c1d67c4cee Update nixpkgs (Jonas Nick)

Pull request description:

Top commit has no ACKs.

Tree-SHA512: 64de79713b656a7535c0a89f8cead5be0168b067d2e79d9b9dfa7152635d09cea677494ad04f8a0b5f9c5278860ff8f75813561ddafb5ca8024f1f66b4fd4f34
2019-10-14 08:31:20 +00:00
Jonas Nick c1d67c4cee
Update nixpkgs 2019-10-07 11:53:05 +00:00
Jonas Nick 8e69e42c12
Update elementsd to 0.18.1.1 2019-10-02 09:23:06 +00:00
Jonas Nick 491dcf9568
Merge #117: Fix nodeinfo for clightning
ae15205689 Mention another way to get nixops to pick up the correct IP address of a virtualbox (Jonas Nick)
4df0c9fcfd Fix nodeinfo for clightning (Jonas Nick)

Pull request description:

ACKs for top commit:
  cypherpunk2140:
    ACK ae15205689

Tree-SHA512: 56fff8c687e0070c0dcd1d7c44cd1b82f6d86103e8634a06fc823dea4bf9d1d986bcfb19caa6c72836c4cbcb636cd5360b3326ae71ee05ecf0942c02566b61b9
2019-09-24 08:15:19 +00:00
William Casarin d7d35b875a nixpkgs-pinned: fetch a tarball instead
it's much faster
2019-09-15 18:33:02 -07:00
Jonas Nick 4df0c9fcfd
Fix nodeinfo for clightning 2019-08-31 15:23:58 +00:00
Jonas Nick e4d2aab561
Merge #107: Add LND support
9d029fd1af Remove lnd explicit tor onion service config (Ștefan D. Mihăilă)
1f407ef22c Remove lnd user from onion-chef (Ștefan D. Mihăilă)
5880023158 Increase xxd column size (Ștefan D. Mihăilă)
101ae3c370 Instruct user to backup channel.backup (Ștefan D. Mihăilă)
fccd91972a Fix "value is a list [...]" error when lnd is not enabled (Ștefan D. Mihăilă)
700fdf6feb Add logdir and tor.privatekeypath to lnd.conf (Ștefan D. Mihăilă)
5a2517b926 Check for existing secrets and create them  more granularly (Ștefan D. Mihăilă)
d6f961db89 Reuse lnd seed (Ștefan D. Mihăilă)
9b0753135c Add LND support (Ștefan D. Mihăilă)
4acf5cd32c Remove unused nginx.csr file (Ștefan D. Mihăilă)
19b971f21f Rename nginx certificate files (Ștefan D. Mihăilă)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 9d029fd1af

Tree-SHA512: 58ee80bcab6c3a1c4642a5d40b94e10d28311557ae7c69539fee90d6f252a6afc70b8066cc7d7ddc0a45e2675978718a369b0341c518f8ce7590cbde1403eaeb
2019-08-31 15:21:38 +00:00
Jonas Nick 820abe213d
Update nixpkgs 2019-08-24 16:02:47 +00:00
Ștefan D. Mihăilă 9b0753135c
Add LND support 2019-08-20 23:54:47 +02:00
Jonas Nick b9f51e3f70
Add liquid-swap tool 2019-08-07 14:51:15 +00:00
Jonas Nick 46aa88c71c
Merge branch 'update-liquid-2' 2019-08-06 09:32:37 +00:00
Jonas Nick 68d25f0c9f
Merge remote-tracking branch 'upstream-pull/101/head' 2019-08-05 07:50:58 +00:00
Jonas Nick 5edf0d7240
Replace liquidd with elementsd package 2019-08-03 14:26:31 +00:00
Jonas Nick 77e3a30a4b
update nixpkgs 2019-07-29 20:09:01 +00:00
nixbitcoin 8cf54d4b13
Update electrs to v0.7.1 2019-07-28 18:48:15 +02:00
Jonas Nick 5a6242c1f3
fixup! Remove doCheck from pylightning package 2019-07-26 14:04:48 +00:00
William Casarin 22fcd47fe5
fixup! Add pylightning package 2019-07-25 13:33:28 +00:00
Jonas Nick 5d8951bdb9
Add pylightning package 2019-07-16 21:19:48 +00:00
Jonas Nick 90e2420efc
Update nixpkgs. Includes clightning 0.7.1 2019-07-14 22:35:43 +00:00
William Casarin 0f23ae522f
hwi: 1.0.0 -> 1.0.1
Signed-off-by: William Casarin <jb55@jb55.com>
2019-06-25 11:02:46 -07:00
Jonas Nick 8363118828
Merge branch 'update-nixpkgs4' 2019-06-21 09:46:51 +00:00
Jonas Nick b4e635c0d2
Re-run spark-wallet generate.sh to pin newer packages 2019-06-21 09:22:32 +00:00
Jonas Nick f3f2fb6f47
Update nixpkgs. Includes Linux SACK CVE fixes 2019-06-20 20:20:40 +00:00
Jonas Nick 5a0e58b9d0
Update spark-wallet package to 0.2.8 2019-06-11 21:59:40 +00:00
Jonas Nick d9eefab336
Merge remote-tracking branch 'upstream-pull/72/head' 2019-06-10 19:55:25 +00:00
nixbitcoin 3227a0151f
Add script to generate electrs expressions with crate2nix 2019-05-30 14:34:56 +02:00
Jonas Nick 4628a3c885
Update pinned nixpkgs 2019-05-27 21:28:29 +00:00
nixbitcoin 8c93d6a9a8
Update electrs to version 0.6.2 with pinned dependencies 2019-05-24 19:25:11 +02:00
Jonas Nick c6667c346a
Merge branch 'update-nixpkgs2' 2019-05-13 15:53:27 +00:00
Jonas Nick 62b11edbb0
Update nixpkgs and switch from nixpkgs-unstable to nixos-unstable. Notable change: includes bitcoind version bump to 0.18 2019-05-06 22:26:16 +00:00
Jonas Nick c2f8bf8067
Add support for ledger and trezor with bitcoin-core/HWI 2019-05-05 20:49:31 +00:00
Jonas Nick 25f30addce
Update to NixOs 19.03 2019-04-24 13:39:46 +00:00
nixbitcoin 0db7a251fd
Update gmaxwell banlist 2019-04-11 23:38:47 +02:00
Jonas Nick f0b78ee411
Update nixpkgs 2019-04-08 13:47:52 +00:00
Jonas Nick c440dfba9f
Merge branch 'electrum-server' of https://github.com/nixbitcoin/nix-bitcoin into nixbitcoin-electrum-server 2019-04-02 15:35:09 +00:00
Jonas Nick aba1b7dfc2
Give operator access to onion hostnames through new onion-manager module 2019-04-02 15:02:31 +00:00
nixbitcoin 4000829002
Use rust stable 1.31 instead of rust nightly for electrs, update electrs, specify electrum-rpc 2019-04-01 17:43:07 +02:00
Clemens Fruhwirth 95b42b62a8 Give pkgs their own directory and convert everything to callPackage. 2019-03-29 11:12:05 +01:00
Jonas Nick 1bc678b6d6
Merge branch 'master' into faster-banlist-abort 2019-03-28 12:51:09 +00:00
Jonas Nick e2f3f38876
Import bitcoind banlist in separate service 2019-03-27 10:46:36 +00:00
Clemens Fruhwirth a0b4d5b932 node2nix packages: Regenerate node2nix output. 2019-03-26 14:31:07 +01:00
Clemens Fruhwirth ed0903b9cc node2nix packages: Style-fix 2019-03-26 14:31:04 +01:00
Clemens Fruhwirth d569d1bb59 node2nix packages: Remove unnecessary node-pre-gyp 2019-03-26 14:31:02 +01:00
Clemens Fruhwirth 2250644f82 node2nix packages: Replace tgz reference with symbolic one.
This is almost equivalent except that with symbolic reference node2nix
consults the NPM registry for package.json information instead of the
package.json in the tgz file. The registry canonicalizes the
"dependencies" attribute in that it adds all "optionalDependencies",
which the npm binary would do for local package.json files, but
node2nix does not.

For spark-wallet optionalDependencies are not listed in the tgz
distributed package.json, hence node2nix misses them. This leads to a
missing qrcode-terminal package and spark-wallet dying when called
with -Q.
2019-03-26 14:30:58 +01:00
Jonas Nick 4752d0fde0
Merge branch 'nixos-fixes' of https://github.com/clefru/nix-bitcoin into clefru-nixos-fixes 2019-03-26 08:58:40 +00:00
Clemens Fruhwirth 316b493cda chmod $out not $src as this fails under NixOS. 2019-03-25 14:34:27 +01:00
Clemens Fruhwirth 5e40066c7f nanopos, lightning-charge and spark-wallet: Package via node2nix
The strategy of invoking node2nix inside a derivation (installPhase in
this case) does not work, as under NixOS installations there is no
network traffic allowed during a derivation build. Hence, we move
node2nix outside and rewrite the packaging into the modules.

Also switch to callPackage instead of plain imports. This could
probably be done on all other imported packages inside of
nix-bitcoin-pkgs.nix.
2019-03-25 14:32:55 +01:00
Jonas Nick d24c5416ed
Update nixpkgs 2019-03-24 21:21:36 +00:00
Jonas Nick 7eed67278d
Merge branch 'electrum-server' of https://github.com/nixbitcoin/nix-bitcoin into nixbitcoin-electrum-server 2019-03-24 20:45:26 +00:00
nixbitcoin fbc78ce6ed
Add Greg Maxwell's banlist to bitcoind postStart 2019-03-21 10:11:18 +01:00
nixbitcoin eacd057963
Fix electrs and add electrs hidden service 2019-03-16 16:11:54 +01:00
nixbitcoin de889d584f
Add proxy and hidden service to liquidd 2019-03-14 11:19:28 +01:00
Jonas Nick 902455e142
Update nixpkgs-unstable for clightning 0.7.0 2019-03-05 10:05:16 +00:00
Jonas Nick 35165c42d8
Update nixpkgs 2019-03-02 20:23:19 +00:00
Jonas Nick ccd768aec1
Update nixpkgs 2019-02-10 18:45:30 +00:00
Jonas Nick 1d020a7ca8
move nixpkgs-pinned.nix 2019-01-26 18:12:08 +00:00
Jonas Nick e4d5d6935d
Update liquidd to 3.14.1.22 2019-01-13 20:45:24 +00:00
Jonas Nick 1646605a80
Pin electrs dependencies (within nixpkgs) 2019-01-04 16:19:52 +00:00
nixbitcoin 9ada1d32f3
Incorproate PR comments, correct erroneous description in clightning module, add electrs module, add electrs package, add electrs to nix-bitcoin.nix, add electrs to modules/nix-bitcoin.nix 2019-01-04 10:44:03 +01:00
Jonas Nick bca40e23b1
Indentation cleanups 2019-01-02 15:17:57 +00:00
Jonas Nick 0fb3f9da5a
Get rid of nixpkgs everywhere and use pkgs arguments instead 2019-01-02 11:24:55 +00:00
Jonas Nick ffcd311b70
Add sshd onion service 2018-12-27 21:22:52 +00:00
Jonas Nick 5b63e7eb27 Fix minor bugs 2018-12-10 22:54:24 +00:00
Jonas Nick 25d52c4d10 Add spark-wallet 2018-12-10 16:34:41 +00:00
Jonas Nick b108198dc0 Update nanopos 2018-12-06 15:58:41 +00:00
Jonas Nick c79aaf9695 Add liquid 2018-12-03 21:43:15 +00:00
Jonas Nick 36327ae89e Move webindex in own module 2018-12-01 21:38:08 +00:00
Jonas Nick 8fae70b80a Add index page with nginx 2018-12-01 20:49:23 +00:00
Jonas Nick b0594aaacd Add nanopos package and module and make clightning service 2018-12-01 17:26:29 +00:00
Jonas Nick c61c21e2e1 fix nodeinfo.sh 2018-11-29 00:30:12 +00:00
Jonas Nick c4935008dc add lightning charge package 2018-11-24 22:34:39 +00:00
Jonas Nick ac2be00c7f Add guest user with same ssh keys as root and fix nodeinfo not waiting for clightning to warm up 2018-11-23 15:49:13 +00:00
Jonas Nick aec819db81 add clightning 2018-11-22 18:32:26 +00:00
Jonas Nick 986217d5d3 add nodeinfo package 2018-11-20 22:14:40 +00:00