From d8d77b8de0517868e9a698bc54303a2b737eeac1 Mon Sep 17 00:00:00 2001 From: Yaroslav Bolyukin Date: Mon, 11 Nov 2024 01:27:42 +0000 Subject: [PATCH] feat: default for nixpkgs.buildUsing --- --- a/README.adoc +++ b/README.adoc @@ -47,9 +47,6 @@ # Single flake may contain multiple fleet configurations, default one is called... `default` fleetConfigurations.default = { - # nixpkgs used to build the systems - nixpkgs.buildUsing = inputs.nixpkgs; - # nixos option section of fleet config declares module, which is used for all configured nixos hosts. nixos = { 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 { -- gitstuff