From a4540a584d762b000b21cb7e61987c414eb72a1d Mon Sep 17 00:00:00 2001 From: tv Date: Sat, 14 Nov 2026 00:27:45 +0000 Subject: populate: layer populate below krops populate is a program of its own, with a Nix library, in pkgs/populate, which krops uses, and which doesn't use krops: - default.nix builds the program, with nix-build there or callPackage, as pkgs.populate-unwrapped. - lib is populate's Nix library: the types of sources and the POSIX types they use, evalSource, flakeFollows, hasGeneratedFlake, and derivesFlake, taking nixpkgs' lib. krops' lib takes them from there, so it provides them as before, and so does lib/types. pkgs.populate, the function from populate's arguments to a script running the program, is krops' own, in pkgs/krops/populate.nix, with checks.nix next to it. It takes the program as populate-unwrapped, which callPackage passes from the overlay; the flake, whose nixpkgs lacks it, passes its own. --- flake.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 9f2d7ef..0b06ec5 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,8 @@ let pkgs = nixpkgs.legacyPackages.${system}; krops = pkgs.callPackage ./pkgs/krops { inherit populate; }; - populate = pkgs.callPackage ./pkgs/populate {}; + populate = pkgs.callPackage ./pkgs/krops/populate.nix { inherit populate-unwrapped; }; + populate-unwrapped = pkgs.callPackage ./pkgs/populate {}; in { inherit populate; inherit (krops) rebuild runShell withNixOutputMonitor writeCommand writeDeploy writeTest; -- cgit v1.3.1