Skip to content

Commit 202644f

Browse files
committed
lib: don't pass --extra-experimental-features
1 parent 5c2e4de commit 202644f

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/lib.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ func buildClosure(spec JobSpec, drvPath string, builder string) (string, error)
2727

2828
// Build the closure locally or on the remote builder
2929
if builder != "localhost" {
30-
buildOut, err = runJSON("nix", "--extra-experimental-features", "nix-command flakes", "build", "--no-link", "--json", "--store", "ssh-ng://"+builder, drvPath+"^*")
30+
buildOut, err = runJSON("nix", "build", "--no-link", "--json", "--store", "ssh-ng://"+builder, drvPath+"^*")
3131
} else {
32-
buildOut, err = runJSON("nix", "--extra-experimental-features", "nix-command flakes", "build", "--no-link", "--json", drvPath+"^*")
32+
buildOut, err = runJSON("nix", "build", "--no-link", "--json", drvPath+"^*")
3333
}
3434
if err != nil {
3535
return "", fmt.Errorf("failed to build %s on %s: %w", spec.Output, builder, err)
@@ -103,7 +103,7 @@ func instantiateDrvPath(flake string, name string, builder string) (string, erro
103103
drvExpr := expr + ".drvPath"
104104

105105
// Evaluate the .drv path locally
106-
data, err := runJSON("nix", "--extra-experimental-features", "nix-command flakes", "eval", "--raw", drvExpr)
106+
data, err := runJSON("nix", "eval", "--raw", drvExpr)
107107
if err != nil {
108108
return "", fmt.Errorf("failed to evaluate drvPath for job '%s': %w", name, err)
109109
}
@@ -112,7 +112,7 @@ func instantiateDrvPath(flake string, name string, builder string) (string, erro
112112

113113
// Copy the .drv to the remote builder (if needed)
114114
if builder != "localhost" {
115-
if _, err := run("nix", "--extra-experimental-features", "nix-command flakes", "copy", "--to", "ssh-ng://"+builder, drvPath); err != nil {
115+
if _, err := run("nix", "copy", "--to", "ssh-ng://"+builder, drvPath); err != nil {
116116
return "", fmt.Errorf("failed to copy .drv for job '%s' to %s: %w", name, builder, err)
117117
}
118118
}
@@ -177,7 +177,7 @@ func validateJobs(jobs map[string]JobSpec, flake string) (map[string]JobSpec, er
177177
// Infer Type if missing
178178
if spec.Type == "" {
179179
expr := fmt.Sprintf("%s#nynxDeployments.%s.output.system", flake, name)
180-
data, err := run("nix", "--extra-experimental-features", "nix-command flakes", "eval", "--raw", expr)
180+
data, err := run("nix", "eval", "--raw", expr)
181181
if err != nil {
182182
return nil, fmt.Errorf("failed to infer type for job '%s': %w", name, err)
183183
}

0 commit comments

Comments
 (0)