From 347078813131e84eb7e8b1a6877f33cd5be8eb92 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Tue, 07 Jul 2026 11:56:33 +0000 Subject: [PATCH] feat: fleetConfiguration is not longer a function --- --- a/crates/fleet-base/src/opts.rs +++ b/crates/fleet-base/src/opts.rs @@ -242,7 +242,7 @@ let builtins_field = Value::eval("builtins")?; let fleet_root = flake.get_field("fleetConfigurations")?; - let fleet_field = nix_go!(fleet_root.default(Obj {})); + let fleet_field = nix_go!(fleet_root.default); let config_field = nix_go!(fleet_field.config); --- a/lib/flakePart.nix +++ b/lib/flakePart.nix @@ -28,7 +28,7 @@ apply = nameToModule: mapAttrs ( - name: module: data: + name: module: let # To use user-provided nixpkgs, we first need to extract wanted nixpkgs attribute, # to do that, evaluate all the modules with only needed option declared. @@ -60,7 +60,7 @@ { inputs, ... }: { config = { - data = if isPath data then import data else data; + data = { }; nixpkgs.buildUsing = mkOptionDefault bootstrapNixpkgs; nixpkgs.overlays = [ (final: prev: { -- gitstuff