From 3f9a2aec68037923b8fe344f92cad983b6ae7934 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Fri, 17 May 2019 22:30:16 +0000 Subject: [PATCH 1/2] Disable miniupnpc. It's only useful for introducing vulnerabilities. --- modules/nix-bitcoin-pkgs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/nix-bitcoin-pkgs.nix b/modules/nix-bitcoin-pkgs.nix index 8ca0d1b..918a257 100644 --- a/modules/nix-bitcoin-pkgs.nix +++ b/modules/nix-bitcoin-pkgs.nix @@ -12,8 +12,8 @@ in { nixpkgs.config.packageOverrides = pkgs: { # Use bitcoin and clightning from unstable - bitcoin = nixpkgs-unstable.bitcoin.override { }; - altcoins.bitcoind = nixpkgs-unstable.altcoins.bitcoind.override { }; + bitcoin = nixpkgs-unstable.bitcoin.override { miniupnpc = null; }; + altcoins.bitcoind = nixpkgs-unstable.altcoins.bitcoind.override { miniupnpc = null; }; clightning = nixpkgs-unstable.clightning.override { }; }; } From f1445c396e0025081fa4eabbb145860b213f7a1a Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Fri, 17 May 2019 22:31:40 +0000 Subject: [PATCH 2/2] Use bitcoind consistently without GUI. The 'bitcoin' package includes the GUI. --- modules/clightning.nix | 2 +- modules/nix-bitcoin.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/clightning.nix b/modules/clightning.nix index 235be41..ba05966 100644 --- a/modules/clightning.nix +++ b/modules/clightning.nix @@ -73,7 +73,7 @@ in { systemd.services.clightning = { description = "Run clightningd"; - path = [ pkgs.bitcoin ]; + path = [ pkgs.altcoins.bitcoind ]; wantedBy = [ "multi-user.target" ]; requires = [ "bitcoind.service" ]; after = [ "bitcoind.service" ]; diff --git a/modules/nix-bitcoin.nix b/modules/nix-bitcoin.nix index 58eeb6a..3d93eca 100644 --- a/modules/nix-bitcoin.nix +++ b/modules/nix-bitcoin.nix @@ -166,7 +166,7 @@ in { }; environment.systemPackages = with pkgs; [ tor - bitcoin + altcoins.bitcoind nodeinfo banlist jq