pkgs: import pinned nixpkgs in default.nix
pkgs/default.nix now explicitly specifies all its dependencies as arguments. This is required for flake support. Also simplify pinned.nix and python-packages by removing unused attrs.
This commit is contained in:
parent
9b24a74b23
commit
de77281cba
3 changed files with 11 additions and 16 deletions
|
|
@ -1,12 +1,6 @@
|
|||
let
|
||||
nixpkgsPinned = import ./nixpkgs-pinned.nix;
|
||||
nixpkgsStable = import nixpkgsPinned.nixpkgs { config = {}; overlays = []; };
|
||||
nixpkgsUnstable = import nixpkgsPinned.nixpkgs-unstable { config = {}; overlays = []; };
|
||||
nixBitcoinPkgsStable = import ./. { pkgs = nixpkgsStable; };
|
||||
nixBitcoinPkgsUnstable = import ./. { pkgs = nixpkgsUnstable; };
|
||||
in
|
||||
pkgs: pkgsUnstable:
|
||||
{
|
||||
inherit (nixpkgsUnstable)
|
||||
inherit (pkgsUnstable)
|
||||
bitcoin
|
||||
bitcoind
|
||||
charge-lnd
|
||||
|
|
@ -21,8 +15,5 @@ in
|
|||
lightning-loop
|
||||
lightning-pool;
|
||||
|
||||
inherit nixpkgsStable nixpkgsUnstable;
|
||||
|
||||
stable = nixBitcoinPkgsStable;
|
||||
unstable = nixBitcoinPkgsUnstable;
|
||||
inherit pkgs pkgsUnstable;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue