From c1d67c4cee51812eba31e67aa38a9f1f8192ca6d Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Wed, 2 Oct 2019 09:32:12 +0000
Subject: [PATCH 1/3] Update nixpkgs

---
 modules/bitcoind.nix         | 6 +++---
 modules/clightning.nix       | 2 +-
 modules/lnd.nix              | 2 +-
 modules/nix-bitcoin-pkgs.nix | 2 +-
 modules/nix-bitcoin.nix      | 2 +-
 pkgs/nixpkgs-pinned.nix      | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/bitcoind.nix b/modules/bitcoind.nix
index 13bb18a..17b4cb4 100644
--- a/modules/bitcoind.nix
+++ b/modules/bitcoind.nix
@@ -65,8 +65,8 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.altcoins.bitcoind;
-        defaultText = "pkgs.altcoins.bitcoind";
+        default = pkgs.blockchains.bitcoind;
+        defaultText = "pkgs.blockchains.bitcoind";
         description = "The package providing bitcoin binaries.";
       };
       extraConfig = mkOption {
@@ -282,7 +282,7 @@ in {
         Type = "simple";
         User = "${cfg.user}";
         Group = "${cfg.group}";
-        ExecStart = "${pkgs.bash}/bin/bash ${pkgs.banlist}/bin/banlist ${pkgs.altcoins.bitcoind}";
+        ExecStart = "${pkgs.bash}/bin/bash ${pkgs.banlist}/bin/banlist ${pkgs.blockchains.bitcoind}";
         StateDirectory = "bitcoind";
 
         # Permission for preStart
diff --git a/modules/clightning.nix b/modules/clightning.nix
index b7aa4b9..dc47bb9 100644
--- a/modules/clightning.nix
+++ b/modules/clightning.nix
@@ -73,7 +73,7 @@ in {
 
     systemd.services.clightning = {
       description = "Run clightningd";
-      path  = [ pkgs.altcoins.bitcoind ];
+      path  = [ pkgs.blockchains.bitcoind ];
       wantedBy = [ "multi-user.target" ];
       requires = [ "bitcoind.service" ];
       after = [ "bitcoind.service" ];
diff --git a/modules/lnd.nix b/modules/lnd.nix
index 58e7848..5131834 100644
--- a/modules/lnd.nix
+++ b/modules/lnd.nix
@@ -104,7 +104,7 @@ in {
 
     systemd.services.lnd = {
       description = "Run LND";
-      path  = [ pkgs.altcoins.bitcoind ];
+      path  = [ pkgs.blockchains.bitcoind ];
       wantedBy = [ "multi-user.target" ];
       requires = [ "bitcoind.service" ];
       after = [ "bitcoind.service" ];
diff --git a/modules/nix-bitcoin-pkgs.nix b/modules/nix-bitcoin-pkgs.nix
index b88274c..4519437 100644
--- a/modules/nix-bitcoin-pkgs.nix
+++ b/modules/nix-bitcoin-pkgs.nix
@@ -13,7 +13,7 @@ in {
   nixpkgs.config.packageOverrides = pkgs: {
     # Use bitcoin and clightning from unstable
     bitcoin = nixpkgs-unstable.bitcoin.override { miniupnpc = null; };
-    altcoins.bitcoind = nixpkgs-unstable.altcoins.bitcoind.override { miniupnpc = null; };
+    blockchains.bitcoind = nixpkgs-unstable.bitcoind.override { miniupnpc = null; };
     clightning = nixpkgs-unstable.clightning.override { };
     lnd = nixpkgs-unstable.lnd.override { };
   };
diff --git a/modules/nix-bitcoin.nix b/modules/nix-bitcoin.nix
index 85c869f..c9ad872 100644
--- a/modules/nix-bitcoin.nix
+++ b/modules/nix-bitcoin.nix
@@ -189,7 +189,7 @@ in {
     };
     environment.systemPackages = with pkgs; [
       tor
-      altcoins.bitcoind
+      blockchains.bitcoind
       nodeinfo
       banlist
       jq
diff --git a/pkgs/nixpkgs-pinned.nix b/pkgs/nixpkgs-pinned.nix
index bc10fd7..e2bfbdb 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 "e6ad5e75f3bfaab5e7b7f0f128bf13d534879e65";
-  nixpkgs-unstable = fetch "765a71f15025ce78024bae3dc4a92bd2be3a8fbf";
+  nixpkgs = fetch "6420e2649fa9e267481fb78e602022dab9d1dcd1";
+  nixpkgs-unstable = fetch "2436c27541b2f52deea3a4c1691216a02152e729";
 }

From 29e612d3bd01e76a4dd9c82b41f2bac79e12105e Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Sun, 13 Oct 2019 20:26:28 +0000
Subject: [PATCH 2/3] Remove spark-wallet with unstable from nixpkgs because it
 doesn't work

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 81a7120..7920fb3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,6 @@ env:
   - PKG=nanopos STABLE=1
   - PKG=nanopos STABLE=0
   - PKG=spark-wallet STABLE=1
-  - PKG=spark-wallet STABLE=0
   - PKG=elementsd STABLE=1
   - PKG=elementsd STABLE=0
   - PKG=electrs STABLE=1

From c5024d0f1578a85d035b9d7a1cdc58ab7c5f8657 Mon Sep 17 00:00:00 2001
From: Jonas Nick <jonasd.nick@gmail.com>
Date: Sun, 13 Oct 2019 20:27:08 +0000
Subject: [PATCH 3/3] Add liquid-swap tool to CI

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 7920fb3..5121480 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,7 @@ env:
   - PKG=elementsd STABLE=1
   - PKG=elementsd STABLE=0
   - PKG=electrs STABLE=1
+  - PKG=liquid-swap STABLE=1
 script: |
   printf '%s (%s)\n' "$NIX_PATH" "$VER"
   nix-build -A $PKG