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

Merge #222: Add nix-bitcoin.lib for utility functions and types

Browse Source 
322ba5bfff Add nix-bitcoin.lib for utility functions and types (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    ACK 322ba5bfff

Tree-SHA512: 61fc91d11c06883ffc15e200dfefd88b4169849c19d3073c76820910c641613e64d01439cc482792a5eaadabeca7711eb838f0f791fcfc70cfa79e2b156f4efc
This commit is contained in:
Jonas Nick 2020-08-23 20:53:35 +00:00
commit b00e9b6aa3
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/clightning.nix
View File

@ -46,7 +46,7 @@ in {
''; '';
}; };
bind-addr = mkOption { bind-addr = mkOption {
type = types.addCheck types.str (s: builtins.length (builtins.split ":" s) == 1); type = pkgs.nix-bitcoin.lib.ipv4Address;
default = "127.0.0.1"; default = "127.0.0.1";
description = "Set an IP address or UNIX domain socket to listen to"; description = "Set an IP address or UNIX domain socket to listen to";
}; };

2
modules/lnd.nix
View File

@ -47,7 +47,7 @@ in {
description = "The data directory for LND."; description = "The data directory for LND.";
}; };
listen = mkOption { listen = mkOption {
type = types.addCheck types.str (s: builtins.length (builtins.split ":" s) == 1); type = pkgs.nix-bitcoin.lib.ipv4Address;
default = "localhost"; default = "localhost";
description = "Bind to given address to listen to peer connections"; description = "Bind to given address to listen to peer connections";
}; };

2
pkgs/default.nix
View File

@ -14,4 +14,6 @@
lightning-loop = pkgs.callPackage ./lightning-loop { }; lightning-loop = pkgs.callPackage ./lightning-loop { };
pinned = import ./pinned.nix; pinned = import ./pinned.nix;
lib = import ./lib.nix { inherit (pkgs) lib; };
} }

5
pkgs/lib.nix Normal file
View File

@ -0,0 +1,5 @@
{ lib }:
{
# An address type that checks that there's no port
ipv4Address = lib.types.addCheck lib.types.str (s: builtins.length (builtins.split ":" s) == 1);
}