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,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 = {
spark-wallet = pkgs.callPackage ./spark-wallet { };
liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { };
@ -16,7 +22,7 @@ let self = {
packageOverrides = import ./python-packages self;
}).pkgs;
pinned = import ./pinned.nix;
pinned = import ./pinned.nix pkgs pkgsUnstable;
modulesPkgs = self // self.pinned;
}; in self