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:
Erik Arvstedt 2021-08-16 10:42:06 +02:00
parent 9b24a74b23
commit de77281cba
No known key found for this signature in database
GPG key ID: 33312B944DD97846
3 changed files with 11 additions and 16 deletions

View file

@ -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;
}