greg/nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to stable channel but pull the bitcoind and clightning packages and the tor module from unstable

Browse Source
This commit is contained in:
Jonas Nick
2019-01-01 19:16:24 +00:00
parent 54b4eb24a6
commit 5e4e959e26
7 changed files with 75 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/nanopos.nix
View File

@@ -35,7 +35,7 @@ in {
'';
};
port = mkOption {
type = types.port;
type = types.ints.u16;
default = 9116;
description = ''
"The port on which to listen for connections.";

4
modules/nixbitcoin-webindex.nix → modules/nix-bitcoin-webindex.nix
View File

@@ -3,7 +3,7 @@
with lib;
let
cfg = config.services.nixbitcoin-webindex;
cfg = config.services.nix-bitcoin-webindex;
indexFile = pkgs.writeText "index.html" ''
<html>
<body>
@@ -35,7 +35,7 @@ let
sed -i "s/CLIGHTNING_ID/$CLIGHTNING_ID/g" /var/www/index.html
'';
in {
options.services.nixbitcoin-webindex = {
options.services.nix-bitcoin-webindex = {
enable = mkOption {
type = types.bool;
default = false;

12
modules/nixbitcoin.nix → modules/nix-bitcoin.nix
View File

@@ -3,7 +3,7 @@
with lib;
let
cfg = config.services.nixbitcoin;
cfg = config.services.nix-bitcoin;
minimalPackages = with pkgs; [
tor
bitcoin
@@ -36,12 +36,12 @@ in {
./clightning.nix
./lightning-charge.nix
./nanopos.nix
./nixbitcoin-webindex.nix
./nix-bitcoin-webindex.nix
./liquid.nix
./spark-wallet.nix
];
options.services.nixbitcoin = {
options.services.nix-bitcoin = {
enable = mkOption {
type = types.bool;
default = false;
@@ -59,6 +59,8 @@ in {
};
config = mkIf cfg.enable {
networking.firewall.enable = true;
# Tor
services.tor.enable = true;
services.tor.client.enable = true;
@@ -69,7 +71,7 @@ in {
port = 22;
}];
version = 3;
}
};
# bitcoind
services.bitcoind.enable = true;
@@ -143,7 +145,7 @@ in {
services.lightning-charge.enable = cfg.modules == "all";
services.nanopos.enable = cfg.modules == "all";
services.nixbitcoin-webindex.enable = cfg.modules == "all";
services.nix-bitcoin-webindex.enable = cfg.modules == "all";
services.clightning.autolisten = cfg.modules == "all";
services.spark-wallet.enable = cfg.modules == "all";
services.tor.hiddenServices.spark-wallet = {