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

difftreelog

fix differentiate between imported functor and just nixpkgs

Yaroslav Bolyukin2024-12-08parent: #ffbc7e9.patch.diff
in: trunk

1 file changed

modifiedcrates/fleet-base/src/opts.rsdiffbeforeafterboth
210210
211		let import = nix_go!(builtins_field.import);211		let import = nix_go!(builtins_field.import);
212		let overlays = nix_go!(config_field.nixpkgs.overlays);212		let overlays = nix_go!(config_field.nixpkgs.overlays);
213		let nixpkgs = nix_go!(config_field.nixpkgs.buildUsing | import);213		let nixpkgs = nix_go!(config_field.nixpkgs.buildUsing);
214		let nixpkgs_imported = nix_go!(nixpkgs | import);
214215
215		let default_pkgs = nix_go!(nixpkgs(Obj {216		let default_pkgs = nix_go!(nixpkgs_imported(Obj {
216			overlays,217			overlays,
217			system: self.local_system.clone(),218			system: self.local_system.clone(),
218		}));219		}));