From 68ef662654c9703083cc0fb8e3a1f3c970ad4026 Mon Sep 17 00:00:00 2001
From: Erik Arvstedt <erik.arvstedt@gmail.com>
Date: Sun, 3 Jul 2022 19:49:09 +0200
Subject: [PATCH] krops: don't reimport pkgs

Previously, the krops pkg was accessed by evaluating nixpkgs with the
krops overlay.
Now directly call krops with an existing pkgs instance.
---
 pkgs/default.nix       | 2 +-
 pkgs/krops/default.nix | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 9c7ee4a..1b1cc7f 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -27,7 +27,7 @@ let self = {
 
   # Internal pkgs
   netns-exec = pkgs.callPackage ./netns-exec { };
-  krops = import ./krops { };
+  krops = import ./krops { inherit pkgs; };
 
   # Deprecated pkgs
   generate-secrets = import ./generate-secrets-deprecated.nix;
diff --git a/pkgs/krops/default.nix b/pkgs/krops/default.nix
index a198095..8f11a3c 100644
--- a/pkgs/krops/default.nix
+++ b/pkgs/krops/default.nix
@@ -8,5 +8,8 @@ let
   };
 in {
   lib = import "${src}/lib";
-  pkgs = import "${src}/pkgs" {};
+  pkgs = rec {
+    krops = pkgs.callPackage "${src}/pkgs/krops" { inherit populate; };
+    populate = pkgs.callPackage "${src}/pkgs/populate" {};
+  };
 }