git.delta.rocks / jrsonnet / refs/commits / d8bac4e1b3aa

29      {29      {
30        lib = import ./lib {inherit flake-utils;};30        lib = import ./lib {
31          inherit flake-utils;
32          fleetPkgsForPkgs = pkgs: import ./pkgs {
33            inherit (pkgs) callPackage;
34            craneLib = crane.mkLib pkgs;
35          };
36        };
31      }37      }
32      // flake-utils.lib.eachDefaultSystem (system: let38      // flake-utils.lib.eachDefaultSystem (system: let
70          // (prefixAttrs "nixpkgs-stable-" (removeAttrs packages-with-nixpkgs-stable ["fleet"]));76          // (prefixAttrs "nixpkgs-stable-" (removeAttrs packages-with-nixpkgs-stable ["fleet"]));
7177
72        devShells.default = craneLib.devShell {78        devShells.default = craneLib.devShell {
73          nativeBuildInputs = with pkgs; [79          packages = with pkgs; [
74            alejandra80            alejandra
75            lld81            lld
76            cargo-edit82            cargo-edit

--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,4 +1,7 @@
-{flake-utils}: {
+{
+  flake-utils,
+  fleetPkgsForPkgs,
+}: {
   fleetConfiguration = {
     # TODO: Provide by fleet, instead of requesting user to provide it.
     # This is not good that user needs to provide it, as it becomes a flake data, and fleet arbitrarily rewriting it
@@ -25,7 +28,8 @@
         ++ [
           data
           ({...}: {
-            inherit nixosModules hosts overlays;
+            inherit nixosModules hosts;
+            overlays = [(final: prev: (fleetPkgsForPkgs final))] ++ overlays;
           })
         ]
         ++ fleetModules;

--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1,5 +1,4 @@
 [
-  ../fleetPkgs.nix
   ../meta.nix
   ../secrets.nix
   ../rollback.nix