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

Get rid of nixpkgs everywhere and use pkgs arguments instead

Browse Source
This commit is contained in:
Jonas Nick 2019-01-02 11:24:55 +00:00
parent d2e203918b
commit 0fb3f9da5a
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nix-bitcoin.nix
View File

@ -8,11 +8,11 @@
unstable-pkgs = import unstable-pkgs-git { }; unstable-pkgs = import unstable-pkgs-git { };
# Custom packages # Custom packages
nodeinfo = (import pkgs/nodeinfo.nix); 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; };
liquidd = 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 =
@ -32,6 +32,6 @@ in {
inherit lightning-charge; inherit lightning-charge;
inherit nanopos; inherit nanopos;
inherit spark-wallet; inherit spark-wallet;
liquidd = (pkgs.callPackage liquidd { }); inherit liquidd;
}; };
} }

4
pkgs/lightning-charge.nix
View File

@ -1,6 +1,4 @@
{pkgs ? import <nixpkgs> { {pkgs, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
with pkgs; with pkgs;

4
pkgs/nanopos.nix
View File

@ -1,6 +1,4 @@
{pkgs ? import <nixpkgs> { {pkgs, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
with pkgs; with pkgs;

3
pkgs/nodeinfo.nix
View File

@ -1,5 +1,6 @@
with import <nixpkgs> {}; # bring all of Nixpkgs into scope {pkgs}:
with pkgs;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nodeinfo"; name = "nodeinfo";
src = ./nodeinfo.sh; src = ./nodeinfo.sh;

4
pkgs/spark-wallet.nix
View File

@ -1,6 +1,4 @@
{pkgs ? import <nixpkgs> { {pkgs, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
with pkgs; with pkgs;