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

Merge branch 'liquid-swap-tool'

Browse Source
This commit is contained in:
Jonas Nick 2019-08-08 11:23:29 +00:00
commit edf6b9fc07
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
default.nix
View File

@ -13,4 +13,5 @@
elementsd = pkgs.callPackage ./pkgs/elementsd { }; elementsd = pkgs.callPackage ./pkgs/elementsd { };
hwi = pkgs.callPackage ./pkgs/hwi { }; hwi = pkgs.callPackage ./pkgs/hwi { };
pylightning = pkgs.python3Packages.callPackage ./pkgs/pylightning { }; pylightning = pkgs.python3Packages.callPackage ./pkgs/pylightning { };
liquid-swap = pkgs.python3Packages.callPackage ./pkgs/liquid-swap { };
} }

3
modules/nix-bitcoin.nix
View File

@ -114,6 +114,7 @@ in {
alias lightning-cli='sudo -u clightning lightning-cli --lightning-dir=${config.services.clightning.dataDir}' alias lightning-cli='sudo -u clightning lightning-cli --lightning-dir=${config.services.clightning.dataDir}'
'' + (if config.services.liquidd.enable then '' '' + (if config.services.liquidd.enable then ''
alias elements-cli='elements-cli -datadir=${config.services.liquidd.dataDir}' alias elements-cli='elements-cli -datadir=${config.services.liquidd.dataDir}'
alias liquidswap-cli='liquidswap-cli -c ${config.services.liquidd.dataDir}/elements.conf'
'' else ""); '' else "");
# Unfortunately c-lightning doesn't allow setting the permissions of the rpc socket # Unfortunately c-lightning doesn't allow setting the permissions of the rpc socket
# https://github.com/ElementsProject/lightning/issues/1366 # https://github.com/ElementsProject/lightning/issues/1366
@ -179,7 +180,7 @@ in {
++ optionals config.services.lightning-charge.enable [lightning-charge] ++ optionals config.services.lightning-charge.enable [lightning-charge]
++ optionals config.services.nanopos.enable [nanopos] ++ optionals config.services.nanopos.enable [nanopos]
++ optionals config.services.nix-bitcoin-webindex.enable [nginx] ++ optionals config.services.nix-bitcoin-webindex.enable [nginx]
++ optionals config.services.liquidd.enable [elementsd] ++ optionals config.services.liquidd.enable [elementsd liquid-swap]
++ optionals config.services.spark-wallet.enable [spark-wallet] ++ optionals config.services.spark-wallet.enable [spark-wallet]
++ optionals config.services.electrs.enable [electrs] ++ optionals config.services.electrs.enable [electrs]
++ optionals (config.services.hardware-wallets.ledger || config.services.hardware-wallets.trezor) [ ++ optionals (config.services.hardware-wallets.ledger || config.services.hardware-wallets.trezor) [

17
pkgs/liquid-swap/default.nix Normal file
View File

@ -0,0 +1,17 @@
{ lib, buildPythonPackage, fetchurl, pyqt5, click }:
buildPythonPackage rec {
pname = "liquid-swap";
version = "0.0.1";
# We're only interested in the cli and not the gui but we need to add pyqt5
# anyway as a build dependency because liquid-swap's setup.py demands it. See
# issue https://github.com/Blockstream/liquid-swap/issues/1.
nativeBuildInputs = [ pyqt5 ];
propagatedBuildInputs = [ click ];
src = fetchurl {
urls = [ "https://github.com/Blockstream/liquid-swap/archive/release_${version}.tar.gz" ];
sha256 = "c90ba78105469273fb799f412caa754d18bfa310984fa11ffd0091f146cca2ba";
};
}