Merge branch 'fix-packages'

This commit is contained in:
Jonas Nick 2019-05-21 22:55:28 +00:00
commit 9e913263df
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
3 changed files with 4 additions and 4 deletions

View File

@ -73,7 +73,7 @@ in {
systemd.services.clightning = { systemd.services.clightning = {
description = "Run clightningd"; description = "Run clightningd";
path = [ pkgs.bitcoin ]; path = [ pkgs.altcoins.bitcoind ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "bitcoind.service" ]; requires = [ "bitcoind.service" ];
after = [ "bitcoind.service" ]; after = [ "bitcoind.service" ];

View File

@ -12,8 +12,8 @@ in {
nixpkgs.config.packageOverrides = pkgs: { nixpkgs.config.packageOverrides = pkgs: {
# Use bitcoin and clightning from unstable # Use bitcoin and clightning from unstable
bitcoin = nixpkgs-unstable.bitcoin.override { }; bitcoin = nixpkgs-unstable.bitcoin.override { miniupnpc = null; };
altcoins.bitcoind = nixpkgs-unstable.altcoins.bitcoind.override { }; altcoins.bitcoind = nixpkgs-unstable.altcoins.bitcoind.override { miniupnpc = null; };
clightning = nixpkgs-unstable.clightning.override { }; clightning = nixpkgs-unstable.clightning.override { };
}; };
} }

View File

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