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

4747
48      # Single flake may contain multiple fleet configurations, default one is called... `default`48      # Single flake may contain multiple fleet configurations, default one is called... `default`
49      fleetConfigurations.default = {49      fleetConfigurations.default = {
50        # nixpkgs used to build the systems
51        nixpkgs.buildUsing = inputs.nixpkgs;
52
53        # nixos option section of fleet config declares module, which is used for all configured nixos hosts.50        # nixos option section of fleet config declares module, which is used for all configured nixos hosts.
54        nixos = {51        nixos = {
55          imports = [inputs.lanzaboote.nixosModules.lanzaboote];52          imports = [inputs.lanzaboote.nixosModules.lanzaboote];

--- a/lib/flakePart.nix
+++ b/lib/flakePart.nix
@@ -10,7 +10,7 @@
   inherit (lib.attrsets) mapAttrs;
   inherit (lib.types) lazyAttrsOf deferredModule unspecified str;
   inherit (lib.strings) isPath;
-  inherit (lib.modules) mkIf;
+  inherit (lib.modules) mkIf mkOptionDefault;
 in {
   options.fleetModules = mkOption {
     type = lazyAttrsOf unspecified;
@@ -44,7 +44,10 @@
                     Nixpkgs to use for fleetConfiguration evaluation.
                   '';
                 };
-                config._module.check = false;
+                config = {
+                  _module.check = false;
+                  nixpkgs.buildUsing = mkOptionDefault inputs.nixpkgs;
+                };
               }
             ];
           };
@@ -60,6 +63,7 @@
                       if isPath data
                       then import data
                       else data;
+                    nixpkgs.buildUsing = mkOptionDefault bootstrapNixpkgs;
                     nixpkgs.overlays = [
                       (final: prev:
                         import ../pkgs {