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

Update nixpkgs

This commit is contained in:
Jonas Nick 2019-10-02 09:32:12 +00:00
parent 491dcf9568
commit c1d67c4cee
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/bitcoind.nix
View File

@ -65,8 +65,8 @@ in {
package = mkOption { package = mkOption {
type = types.package; 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."; description = "The package providing bitcoin binaries.";
}; };
extraConfig = mkOption { extraConfig = mkOption {
@ -282,7 +282,7 @@ in {
Type = "simple"; Type = "simple";
User = "${cfg.user}"; User = "${cfg.user}";
Group = "${cfg.group}"; 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"; StateDirectory = "bitcoind";
# Permission for preStart # Permission for preStart

2
modules/clightning.nix
View File

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

2
modules/lnd.nix
View File

@ -104,7 +104,7 @@ in {
systemd.services.lnd = { systemd.services.lnd = {
description = "Run LND"; description = "Run LND";
path = [ pkgs.altcoins.bitcoind ]; path = [ pkgs.blockchains.bitcoind ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
requires = [ "bitcoind.service" ]; requires = [ "bitcoind.service" ];
after = [ "bitcoind.service" ]; after = [ "bitcoind.service" ];

2
modules/nix-bitcoin-pkgs.nix
View File

@ -13,7 +13,7 @@ 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 { miniupnpc = null; }; 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 { }; clightning = nixpkgs-unstable.clightning.override { };
lnd = nixpkgs-unstable.lnd.override { }; lnd = nixpkgs-unstable.lnd.override { };
}; };

2
modules/nix-bitcoin.nix
View File

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

4
pkgs/nixpkgs-pinned.nix
View File

@ -2,6 +2,6 @@ let
fetch = rev: builtins.fetchTarball "https://github.com/nixos/nixpkgs-channels/archive/${rev}.tar.gz"; fetch = rev: builtins.fetchTarball "https://github.com/nixos/nixpkgs-channels/archive/${rev}.tar.gz";
in in
{ {
nixpkgs = fetch "e6ad5e75f3bfaab5e7b7f0f128bf13d534879e65"; nixpkgs = fetch "6420e2649fa9e267481fb78e602022dab9d1dcd1";
nixpkgs-unstable = fetch "765a71f15025ce78024bae3dc4a92bd2be3a8fbf"; nixpkgs-unstable = fetch "2436c27541b2f52deea3a4c1691216a02152e729";
} }