From 1d022f201725ba2e2aebe74a63e0292f315f73d1 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 14 Oct 2019 15:05:43 +0000 Subject: [PATCH 1/6] Remove PyQt dependency from liquid-swap tool because it doesn't work with NixOs 19.09 and we don't need it anyway --- pkgs/liquid-swap/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/liquid-swap/default.nix b/pkgs/liquid-swap/default.nix index ce6f227..5eedc28 100644 --- a/pkgs/liquid-swap/default.nix +++ b/pkgs/liquid-swap/default.nix @@ -1,17 +1,18 @@ -{ lib, buildPythonPackage, fetchurl, pyqt5, click }: +{ lib, buildPythonPackage, fetchurl, click }: buildPythonPackage rec { pname = "liquid-swap"; - version = "0.0.1"; + version = "0.0.2"; - # 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"; + sha256 = "9fa920ee7d03d1af8252131cd7d5a825bb66b8ad536403b4f5437ff6c91a68b1"; }; + # Not sure if this does anything, but it should + installFlags = [ ".[CLI]" ]; + # The tests unfortunately seem to require the PyQt for the GUI + doCheck = false; } + From 26d2e11a6b4913729ad7a4088c36b5c62f5c7ef7 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Mon, 14 Oct 2019 15:06:21 +0000 Subject: [PATCH 2/6] Update to NixOS 19.09 --- pkgs/nixpkgs-pinned.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/nixpkgs-pinned.nix b/pkgs/nixpkgs-pinned.nix index e2bfbdb..b3ca47f 100644 --- a/pkgs/nixpkgs-pinned.nix +++ b/pkgs/nixpkgs-pinned.nix @@ -2,6 +2,6 @@ let fetch = rev: builtins.fetchTarball "https://github.com/nixos/nixpkgs-channels/archive/${rev}.tar.gz"; in { - nixpkgs = fetch "6420e2649fa9e267481fb78e602022dab9d1dcd1"; - nixpkgs-unstable = fetch "2436c27541b2f52deea3a4c1691216a02152e729"; + nixpkgs = fetch "27a5ddcf747fb2bb81ea9c63f63f2eb3eec7a2ec"; + nixpkgs-unstable = fetch "4cd2cb43fb3a87f48c1e10bb65aee99d8f24cb9d"; } From b2fb83c910258d98cc20d76b9e19518f85ac6e4a Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Tue, 15 Oct 2019 07:25:48 +0000 Subject: [PATCH 3/6] Use our own bitcoind module instead of nixpkgs' --- modules/nix-bitcoin-pkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix-bitcoin-pkgs.nix b/modules/nix-bitcoin-pkgs.nix index 4519437..8c4d089 100644 --- a/modules/nix-bitcoin-pkgs.nix +++ b/modules/nix-bitcoin-pkgs.nix @@ -3,7 +3,7 @@ let nixpkgs-pinned = import ../pkgs/nixpkgs-pinned.nix; nixpkgs-unstable = import nixpkgs-pinned.nixpkgs-unstable { }; in { - disabledModules = [ "services/security/tor.nix" ]; + disabledModules = [ "services/security/tor.nix" "services/networking/bitcoind.nix" ]; imports = [ (nixpkgs-pinned.nixpkgs-unstable + "/nixos/modules/services/security/tor.nix") ]; From 09d2df1a81e0d8b9ad2631e96c6e875a82d33683 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Tue, 15 Oct 2019 07:27:59 +0000 Subject: [PATCH 4/6] Use stable tor module instead of unstable which we had to use because stable didn't support v3 onion services --- modules/nix-bitcoin-pkgs.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/nix-bitcoin-pkgs.nix b/modules/nix-bitcoin-pkgs.nix index 8c4d089..d5c8bd5 100644 --- a/modules/nix-bitcoin-pkgs.nix +++ b/modules/nix-bitcoin-pkgs.nix @@ -3,10 +3,7 @@ let nixpkgs-pinned = import ../pkgs/nixpkgs-pinned.nix; nixpkgs-unstable = import nixpkgs-pinned.nixpkgs-unstable { }; in { - disabledModules = [ "services/security/tor.nix" "services/networking/bitcoind.nix" ]; - imports = [ - (nixpkgs-pinned.nixpkgs-unstable + "/nixos/modules/services/security/tor.nix") - ]; + disabledModules = [ "services/networking/bitcoind.nix" ]; nixpkgs.overlays = [ (import ../overlay.nix) ]; From 8dd27b63341e1013142125366130b63811393dfe Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Tue, 15 Oct 2019 07:37:32 +0000 Subject: [PATCH 5/6] Use types.str instead of types.string to avoid warning --- modules/bitcoind.nix | 10 +++++----- modules/clightning.nix | 6 +++--- modules/hardware-wallets.nix | 2 +- modules/lightning-charge.nix | 2 +- modules/liquid.nix | 6 +++--- modules/recurring-donations.nix | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/bitcoind.nix b/modules/bitcoind.nix index 17b4cb4..5ee9363 100644 --- a/modules/bitcoind.nix +++ b/modules/bitcoind.nix @@ -122,12 +122,12 @@ in { }; rpcuser = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; description = "Username for JSON-RPC connections"; }; rpcpassword = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; description = "Password for JSON-RPC connections"; }; @@ -143,7 +143,7 @@ in { description = "Override the default port on which to listen for connections."; }; proxy = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; description = "Connect through SOCKS5 proxy"; }; @@ -194,13 +194,13 @@ in { ''; }; zmqpubrawblock = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; example = "tcp://127.0.0.1:28332"; description = "ZMQ address for zmqpubrawblock notifications"; }; zmqpubrawtx = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; example = "tcp://127.0.0.1:28333"; description = "ZMQ address for zmqpubrawtx notifications"; diff --git a/modules/clightning.nix b/modules/clightning.nix index dc47bb9..042187b 100644 --- a/modules/clightning.nix +++ b/modules/clightning.nix @@ -30,7 +30,7 @@ in { ''; }; proxy = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; description = "Set a socks proxy to use to connect to Tor nodes (or for all connections if *always-use-proxy* is set)"; }; @@ -42,12 +42,12 @@ in { ''; }; bind-addr = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; description = "Set an IP address or UNIX domain socket to listen to"; }; bitcoin-rpcuser = mkOption { - type = types.string; + type = types.str; description = '' Bitcoin RPC user ''; diff --git a/modules/hardware-wallets.nix b/modules/hardware-wallets.nix index 738804a..33d3a3c 100644 --- a/modules/hardware-wallets.nix +++ b/modules/hardware-wallets.nix @@ -23,7 +23,7 @@ in { ''; }; group = mkOption { - type = types.string; + type = types.str; default = "hardware-wallets"; description = '' Group the hardware wallet udev rules apply to. diff --git a/modules/lightning-charge.nix b/modules/lightning-charge.nix index bd0e371..003a1b3 100644 --- a/modules/lightning-charge.nix +++ b/modules/lightning-charge.nix @@ -15,7 +15,7 @@ in { ''; }; clightning-datadir = mkOption { - type = types.string; + type = types.str; default = "/var/lib/clighting/"; description = '' Data directory of the clightning service diff --git a/modules/liquid.nix b/modules/liquid.nix index 10ba050..968618d 100644 --- a/modules/liquid.nix +++ b/modules/liquid.nix @@ -111,12 +111,12 @@ in { }; rpcuser = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; description = "Username for JSON-RPC connections"; }; rpcpassword = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; description = "Password for JSON-RPC connections"; }; @@ -132,7 +132,7 @@ in { description = "Override the default port on which to listen for connections."; }; proxy = mkOption { - type = types.nullOr types.string; + type = types.nullOr types.str; default = null; description = "Connect through SOCKS5 proxy"; }; diff --git a/modules/recurring-donations.nix b/modules/recurring-donations.nix index a4f46b0..1f9e491 100644 --- a/modules/recurring-donations.nix +++ b/modules/recurring-donations.nix @@ -61,7 +61,7 @@ in { ''; }; interval = mkOption { - type = types.string; + type = types.str; default = "Mon *-*-* 00:00:00"; description = '' Schedules the donations. Default is weekly on Mon 00:00:00. See `man From 664c5c67628374da5cc615e49ae42ae3931c63fd Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Sun, 27 Oct 2019 19:52:56 +0000 Subject: [PATCH 6/6] Switch from python 3.5 to python 3.x for trezor --- modules/nix-bitcoin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nix-bitcoin.nix b/modules/nix-bitcoin.nix index c9ad872..ba8c4d4 100644 --- a/modules/nix-bitcoin.nix +++ b/modules/nix-bitcoin.nix @@ -209,7 +209,7 @@ in { usbutils ] ++ optionals config.services.hardware-wallets.trezor [ - python35.pkgs.trezor + python3.pkgs.trezor ]; }; }