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

krops: don't reimport pkgs

Browse Source 
Previously, the krops pkg was accessed by evaluating nixpkgs with the
krops overlay.
Now directly call krops with an existing pkgs instance.
This commit is contained in:
Erik Arvstedt 2022-07-03 19:49:09 +02:00
parent 285a38803c
commit 68ef662654
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/default.nix
View File

@ -27,7 +27,7 @@ let self = {
# Internal pkgs # Internal pkgs
netns-exec = pkgs.callPackage ./netns-exec { }; netns-exec = pkgs.callPackage ./netns-exec { };
krops = import ./krops { }; krops = import ./krops { inherit pkgs; };
# Deprecated pkgs # Deprecated pkgs
generate-secrets = import ./generate-secrets-deprecated.nix; generate-secrets = import ./generate-secrets-deprecated.nix;

5
pkgs/krops/default.nix
View File

@ -8,5 +8,8 @@ let
}; };
in { in {
lib = import "${src}/lib"; lib = import "${src}/lib";
pkgs = import "${src}/pkgs" {}; pkgs = rec {
krops = pkgs.callPackage "${src}/pkgs/krops" { inherit populate; };
populate = pkgs.callPackage "${src}/pkgs/populate" {};
};
} }