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

--- a/flake.nix
+++ b/flake.nix
@@ -27,7 +27,13 @@
   }:
     with nixpkgs.lib;
       {
-        lib = import ./lib {inherit flake-utils;};
+        lib = import ./lib {
+          inherit flake-utils;
+          fleetPkgsForPkgs = pkgs: import ./pkgs {
+            inherit (pkgs) callPackage;
+            craneLib = crane.mkLib pkgs;
+          };
+        };
       }
       // flake-utils.lib.eachDefaultSystem (system: let
         pkgs =
@@ -70,7 +76,7 @@
           // (prefixAttrs "nixpkgs-stable-" (removeAttrs packages-with-nixpkgs-stable ["fleet"]));
 
         devShells.default = craneLib.devShell {
-          nativeBuildInputs = with pkgs; [
+          packages = with pkgs; [
             alejandra
             lld
             cargo-edit

1{flake-utils}: {1{
2  flake-utils,
3  fleetPkgsForPkgs,
4}: {
2  fleetConfiguration = {5  fleetConfiguration = {
3    # TODO: Provide by fleet, instead of requesting user to provide it.6    # TODO: Provide by fleet, instead of requesting user to provide it.
25        ++ [28        ++ [
26          data29          data
27          ({...}: {30          ({...}: {
28            inherit nixosModules hosts overlays;31            inherit nixosModules hosts;
32            overlays = [(final: prev: (fleetPkgsForPkgs final))] ++ overlays;
29          })33          })
30        ]34        ]
31        ++ fleetModules;35        ++ 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