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

Merge fort-nix/nix-bitcoin#502: krops: don't reimport pkgs

Browse Source 
68ef662654 krops: don't reimport pkgs (Erik Arvstedt)

Pull request description:

ACKs for top commit:
  jonasnick:
    ACK 68ef662654

Tree-SHA512: e2c7de823b2c6fb980ac178750d1b908f0bf58c5c1e22394a9ee245cfa471f52356d14fcb6349fa12555237ef69f3f7bcac4e3f8a92ec68786b6fbea540f82c6
This commit is contained in:
Jonas Nick 2022-07-05 09:39:01 +00:00
commit cb677853b7
No known key found for this signature in database
GPG Key ID: 4861DBF262123605
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" {};
};
} }