fix: make flake dev env vars respect per-worktree overrides#8374
Draft
fix: make flake dev env vars respect per-worktree overrides#8374
Conversation
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Deploying windmill with
|
| Latest commit: |
2644325
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://24a3a3fc.windmill.pages.dev |
| Branch Preview URL: | https://audit-webmux-startup.windmill.pages.dev |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Webmux/workmux worktrees get per-worktree
DATABASE_URL,REMOTE, and port assignments via.env.local. However, the Nix flake'sdevEnvVarshardcoded these as derivation attributes, which direnv (use flake) applied unconditionally — overwriting the correct worktree-specific values with the main worktree defaults.Changes
DATABASE_URL,REMOTE,REMOTE_LSPfrom Nix attrs to ashellHookusing${VAR:-default}so they respect pre-existing values from webmux'sruntime.envshellHook = devShellHookto bothdefaultandfulldevShells.envrcto source.env.localafteruse flake, so direnv picks up per-worktree overrides (needed becausenix print-dev-envevaluates shellHook in a clean subshell)Test plan
.env.local):echo $DATABASE_URLstill showswindmilldefault.env.local:echo $DATABASE_URLshows worktree-specific DB,echo $REMOTEshows correct portnix developwithout direnv: defaults still applyGenerated with Claude Code