@@ -33,8 +33,6 @@ type ShellPlan struct {
33
33
DevPackages []string `cue:"[...string]" json:"dev_packages,omitempty"`
34
34
// Init hook on shell start. Currently, Nginx and python pip planners need it for shell.
35
35
ShellInitHook []string `cue:"[...string]" json:"shell_init_hook,omitempty"`
36
- // Nix overlays. Currently, Rust needs it for shell.
37
- NixOverlays []string `cue:"[...string]" json:"nix_overlays,omitempty"`
38
36
// Nix expressions. Currently, PHP needs it for shell.
39
37
Definitions []string `cue:"[...string]" json:"definitions,omitempty"`
40
38
// GeneratedFiles is a map of name => content for files that should be generated
@@ -54,7 +52,7 @@ type PlannerForPackages interface {
54
52
}
55
53
56
54
// MergeShellPlans merges multiple Plans into one. The merged plan's packages, definitions,
57
- // and overlays is the union of the packages, definitions, and overlays of the input plans,
55
+ // and shellInitHooks is the union of the packages, definitions, and shellInitHooks of the input plans,
58
56
// respectively.
59
57
func MergeShellPlans (plans ... * ShellPlan ) (* ShellPlan , error ) {
60
58
shellPlan := & ShellPlan {}
@@ -67,7 +65,6 @@ func MergeShellPlans(plans ...*ShellPlan) (*ShellPlan, error) {
67
65
68
66
shellPlan .DevPackages = pkgslice .Unique (shellPlan .DevPackages )
69
67
shellPlan .Definitions = pkgslice .Unique (shellPlan .Definitions )
70
- shellPlan .NixOverlays = pkgslice .Unique (shellPlan .NixOverlays )
71
68
shellPlan .ShellInitHook = pkgslice .Unique (shellPlan .ShellInitHook )
72
69
73
70
return shellPlan , nil
0 commit comments