greg
/
nix-bitcoin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move nix-bitcoin.nix into modules

This commit is contained in:
Jonas Nick 2019-01-26 18:06:25 +00:00
parent 5d494f2a19
commit 6763459b62
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.nix
View File

@ -5,7 +5,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
./nix-bitcoin.nix ./modules/nix-bitcoin.nix
# FIXME: Uncomment next line to import your hardware configuration. If so, # FIXME: Uncomment next line to import your hardware configuration. If so,
# add the hardware configuration file to the same directory as this file. # add the hardware configuration file to the same directory as this file.
# This is not needed when deploying to a virtual box. # This is not needed when deploying to a virtual box.

15
nix-bitcoin.nix → modules/nix-bitcoin-pkgs.nix
View File

@ -1,19 +1,18 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
nixpkgs-pinned = import ./nixpkgs-pinned.nix; nixpkgs-pinned = import ../nixpkgs-pinned.nix;
nixpkgs-unstable = import nixpkgs-pinned.nixpkgs-unstable { }; nixpkgs-unstable = import nixpkgs-pinned.nixpkgs-unstable { };
# Custom packages # Custom packages
nodeinfo = (import pkgs/nodeinfo.nix) { inherit pkgs; }; nodeinfo = (import ../pkgs/nodeinfo.nix) { inherit pkgs; };
lightning-charge = import pkgs/lightning-charge.nix { inherit pkgs; }; lightning-charge = import ../pkgs/lightning-charge.nix { inherit pkgs; };
nanopos = import pkgs/nanopos.nix { inherit pkgs; }; nanopos = import ../pkgs/nanopos.nix { inherit pkgs; };
spark-wallet = import pkgs/spark-wallet.nix { inherit pkgs; }; spark-wallet = import ../pkgs/spark-wallet.nix { inherit pkgs; };
electrs = pkgs.callPackage (import pkgs/electrs.nix) { }; electrs = pkgs.callPackage (import ../pkgs/electrs.nix) { };
liquidd = pkgs.callPackage (import pkgs/liquidd.nix) { }; liquidd = pkgs.callPackage (import ../pkgs/liquidd.nix) { };
in { in {
disabledModules = [ "services/security/tor.nix" ]; disabledModules = [ "services/security/tor.nix" ];
imports = [ imports = [
./modules/nix-bitcoin.nix
(nixpkgs-pinned.nixpkgs-unstable + "/nixos/modules/services/security/tor.nix") (nixpkgs-pinned.nixpkgs-unstable + "/nixos/modules/services/security/tor.nix")
]; ];

1
modules/nix-bitcoin.nix
View File

@ -33,6 +33,7 @@ let
''; '';
in { in {
imports = [ imports = [
./nix-bitcoin-pkgs.nix
./bitcoind.nix ./bitcoind.nix
./clightning.nix ./clightning.nix
./lightning-charge.nix ./lightning-charge.nix