Merge #124: Update to NixOS 19.09

664c5c6762 Switch from python 3.5 to python 3.x for trezor (Jonas Nick)
8dd27b6334 Use types.str instead of types.string to avoid warning (Jonas Nick)
09d2df1a81 Use stable tor module instead of unstable which we had to use because stable didn't support v3 onion services (Jonas Nick)
b2fb83c910 Use our own bitcoind module instead of nixpkgs' (Jonas Nick)
26d2e11a6b Update to NixOS 19.09 (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 (Jonas Nick)

Pull request description:

ACKs for top commit:
  erikarvstedt:
    Tested ACK 664c5c6762

Tree-SHA512: eecbb15011ce8849b8c54788e296109a7f0529286b5a38cd2dd90268cbd03ca396555296ac2018e7e82d88cace18d97ab69201a252b30b3b87db0ae136c410c5

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";

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
       '';

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.

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

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";
       };

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" ];
-  imports = [
-    (nixpkgs-pinned.nixpkgs-unstable + "/nixos/modules/services/security/tor.nix")
-  ];
+  disabledModules = [ "services/networking/bitcoind.nix" ];
 
   nixpkgs.overlays = [ (import ../overlay.nix) ];
 

modules/nix-bitcoin.nix

@@ -209,7 +209,7 @@ in {
         usbutils
     ]
     ++ optionals config.services.hardware-wallets.trezor [
-        python35.pkgs.trezor
+        python3.pkgs.trezor
     ];
   };
 }

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

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;
 }
+

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";
 }