From 47b2b110ccf93f45a2bd59370552fc87316d7b7a Mon Sep 17 00:00:00 2001 From: William Casarin Date: Wed, 22 Apr 2020 14:53:06 -0700 Subject: [PATCH] pinned: make it easy to use pinned packages It appears the pinned attrset is a bit adhoc. This generalizes pinned.nix so that you can do: $ nix build -f . pinned.stable.hwi $ nix build -f . pinned.unstable.hwi etc Signed-off-by: William Casarin --- pkgs/pinned.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix index a03a46d..6fe06e2 100644 --- a/pkgs/pinned.nix +++ b/pkgs/pinned.nix @@ -1,13 +1,18 @@ let nixpkgsPinned = import ./nixpkgs-pinned.nix; - unstable = import nixpkgsPinned.nixpkgs-unstable { config = {}; overlays = []; }; - nixBitcoinPkgsUnstable = import ./. { pkgs = unstable; }; + nixpkgsStable = import nixpkgsPinned.nixpkgs { config = {}; overlays = []; }; + nixpkgsUnstable = import nixpkgsPinned.nixpkgs-unstable { config = {}; overlays = []; }; + nixBitcoinPkgsStable = import ./. { pkgs = nixpkgsStable; }; + nixBitcoinPkgsUnstable = import ./. { pkgs = nixpkgsUnstable; }; in { - inherit (unstable) + inherit (nixpkgsUnstable) bitcoin bitcoind clightning lnd; inherit (nixBitcoinPkgsUnstable) electrs; + + stable = nixBitcoinPkgsStable; + unstable = nixBitcoinPkgsUnstable; }