File tree 2 files changed +6
-5
lines changed
2 files changed +6
-5
lines changed Original file line number Diff line number Diff line change @@ -47,9 +47,6 @@ An NixOS cluster deployment tool.
47
47
48
48
# Single flake may contain multiple fleet configurations, default one is called... `default`
49
49
fleetConfigurations.default = {
50
- # nixpkgs used to build the systems
51
- nixpkgs.buildUsing = inputs.nixpkgs;
52
-
53
50
# nixos option section of fleet config declares module, which is used for all configured nixos hosts.
54
51
nixos = {
55
52
imports = [inputs.lanzaboote.nixosModules.lanzaboote];
Original file line number Diff line number Diff line change 10
10
inherit ( lib . attrsets ) mapAttrs ;
11
11
inherit ( lib . types ) lazyAttrsOf deferredModule unspecified str ;
12
12
inherit ( lib . strings ) isPath ;
13
- inherit ( lib . modules ) mkIf ;
13
+ inherit ( lib . modules ) mkIf mkOptionDefault ;
14
14
in {
15
15
options . fleetModules = mkOption {
16
16
type = lazyAttrsOf unspecified ;
44
44
Nixpkgs to use for fleetConfiguration evaluation.
45
45
'' ;
46
46
} ;
47
- config . _module . check = false ;
47
+ config = {
48
+ _module . check = false ;
49
+ nixpkgs . buildUsing = mkOptionDefault inputs . nixpkgs ;
50
+ } ;
48
51
}
49
52
] ;
50
53
} ;
60
63
if isPath data
61
64
then import data
62
65
else data ;
66
+ nixpkgs . buildUsing = mkOptionDefault bootstrapNixpkgs ;
63
67
nixpkgs . overlays = [
64
68
( final : prev :
65
69
import ../pkgs {
You can’t perform that action at this time.
0 commit comments