diff --git a/go.mod b/go.mod index 4ea6d158..c5466cb8 100644 --- a/go.mod +++ b/go.mod @@ -24,6 +24,7 @@ require ( github.com/gorilla/sessions v1.4.0 github.com/gorilla/websocket v1.5.3 github.com/hiddeco/sshsig v0.2.0 + github.com/hpcloud/tail v1.0.0 github.com/ipfs/go-cid v0.5.0 github.com/lestrrat-go/jwx/v2 v2.1.6 github.com/mattn/go-sqlite3 v1.14.24 @@ -82,7 +83,6 @@ require ( github.com/hashicorp/go-retryablehttp v0.7.7 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect - github.com/hpcloud/tail v1.0.0 // indirect github.com/ipfs/bbloom v0.0.4 // indirect github.com/ipfs/boxo v0.30.0 // indirect github.com/ipfs/go-block-format v0.2.1 // indirect diff --git a/spindle/models/pipeline.go b/spindle/models/pipeline.go index 4381dece..b696d731 100644 --- a/spindle/models/pipeline.go +++ b/spindle/models/pipeline.go @@ -53,7 +53,7 @@ func ToPipeline(pl tangled.Pipeline, cfg config.Config) *Pipeline { swf.Image = workflowImage(twf.Dependencies, cfg.Pipelines.Nixery) swf.addNixProfileToPath() - swf.enableNixFlakes() + swf.setGlobalEnvs() setup := &setupSteps{} setup.addStep(nixConfStep()) @@ -103,6 +103,7 @@ func (wf *Workflow) addNixProfileToPath() { wf.Environment["PATH"] = "$PATH:/.nix-profile/bin" } -func (wf *Workflow) enableNixFlakes() { +func (wf *Workflow) setGlobalEnvs() { wf.Environment["NIX_CONFIG"] = "experimental-features = nix-command flakes" + wf.Environment["HOME"] = "/tangled/workspace" }