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

pkgs: import pinned nixpkgs in default.nix

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/default.nix
View File

@ -1,4 +1,10 @@
{ pkgs ? import <nixpkgs> {} }: let
nixpkgsPinned = import ./nixpkgs-pinned.nix;
in
# Set default values for use without flakes
{ pkgs ? import <nixpkgs> { config = {}; overlays = []; }
, pkgsUnstable ? import nixpkgsPinned.nixpkgs-unstable { config = {}; overlays = []; }
}:
let self = { let self = {
spark-wallet = pkgs.callPackage ./spark-wallet { }; spark-wallet = pkgs.callPackage ./spark-wallet { };
liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { }; liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { };
@ -16,7 +22,7 @@ let self = {
packageOverrides = import ./python-packages self; packageOverrides = import ./python-packages self;
}).pkgs; }).pkgs;
pinned = import ./pinned.nix; pinned = import ./pinned.nix pkgs pkgsUnstable;
modulesPkgs = self // self.pinned; modulesPkgs = self // self.pinned;
}; in self }; in self

15
pkgs/pinned.nix
View File

@ -1,12 +1,6 @@
let pkgs: pkgsUnstable:
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
{ {
inherit (nixpkgsUnstable) inherit (pkgsUnstable)
bitcoin bitcoin
bitcoind bitcoind
charge-lnd charge-lnd
@ -21,8 +15,5 @@ in
lightning-loop lightning-loop
lightning-pool; lightning-pool;
inherit nixpkgsStable nixpkgsUnstable; inherit pkgs pkgsUnstable;
stable = nixBitcoinPkgsStable;
unstable = nixBitcoinPkgsUnstable;
} }

2
pkgs/python-packages/default.nix
View File

@ -4,8 +4,6 @@ let
joinmarketPkg = pkg: callPackage pkg { inherit (nbPkgs.joinmarket) version src; }; joinmarketPkg = pkg: callPackage pkg { inherit (nbPkgs.joinmarket) version src; };
clightningPkg = pkg: callPackage pkg { inherit (nbPkgs.pinned) clightning; }; clightningPkg = pkg: callPackage pkg { inherit (nbPkgs.pinned) clightning; };
unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable;
in { in {
bencoderpyx = callPackage ./bencoderpyx {}; bencoderpyx = callPackage ./bencoderpyx {};
coincurve = callPackage ./coincurve {}; coincurve = callPackage ./coincurve {};