Merge #120: Update nixpkgs

c5024d0f15 Add liquid-swap tool to CI (Jonas Nick)
29e612d3bd Remove spark-wallet with unstable from nixpkgs because it doesn't work (Jonas Nick)
c1d67c4cee Update nixpkgs (Jonas Nick)

Pull request description:

Top commit has no ACKs.

Tree-SHA512: 64de79713b656a7535c0a89f8cead5be0168b067d2e79d9b9dfa7152635d09cea677494ad04f8a0b5f9c5278860ff8f75813561ddafb5ca8024f1f66b4fd4f34

.travis.yml

@@ -26,10 +26,10 @@ 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
+  - PKG=liquid-swap STABLE=1
 script: |
   printf '%s (%s)\n' "$NIX_PATH" "$VER"
   nix-build -A $PKG

modules/bitcoind.nix

@@ -65,8 +65,8 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pkgs.altcoins.bitcoind;
+        default = pkgs.blockchains.bitcoind;
-        defaultText = "pkgs.altcoins.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

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

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

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

modules/nix-bitcoin.nix

@@ -189,7 +189,7 @@ in {
     };
     environment.systemPackages = with pkgs; [
       tor
-      altcoins.bitcoind
+      blockchains.bitcoind
       nodeinfo
       banlist
       jq

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 = fetch "6420e2649fa9e267481fb78e602022dab9d1dcd1";
-  nixpkgs-unstable = fetch "765a71f15025ce78024bae3dc4a92bd2be3a8fbf";
+  nixpkgs-unstable = fetch "2436c27541b2f52deea3a4c1691216a02152e729";
 }