aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Morgan <djm_uk@protonmail.com>2026-10-30 09:59:52 +0000
committerDavid Morgan <djm_uk@protonmail.com>2026-10-30 10:07:40 +0000
commit9773c6a03a9cb63a372a143dfa49db2717163e7b (patch)
tree9523b683e3b8bedcdac6701ee93fd9a8db888ab0
parent735c1138f8e8f89ea008013120815c3f29fa9172 (diff)
downloaddotfiles-9773c6a03a9cb63a372a143dfa49db2717163e7b.tar.gz
Fix direnv patch
-rw-r--r--nix-conf/overlays/direnv-workdir-unstable.patch83
-rw-r--r--nix-conf/overlays/modifications.nix7
2 files changed, 89 insertions, 1 deletions
diff --git a/nix-conf/overlays/direnv-workdir-unstable.patch b/nix-conf/overlays/direnv-workdir-unstable.patch
new file mode 100644
index 0000000..0c8ceb4
--- /dev/null
+++ b/nix-conf/overlays/direnv-workdir-unstable.patch
@@ -0,0 +1,83 @@
+diff --git a/internal/cmd/const.go b/internal/cmd/const.go
+index 8798174..52687ca 100644
+--- a/internal/cmd/const.go
++++ b/internal/cmd/const.go
+@@ -7,6 +7,7 @@ const (
+ DIRENV_DEBUG = "DIRENV_DEBUG"
+ DIRENV_DISABLE = "DIRENV_DISABLE"
+
++ DIRENV_WORKDIR = "DIRENV_WORKDIR"
+ DIRENV_DIR = "DIRENV_DIR"
+ DIRENV_FILE = "DIRENV_FILE"
+ DIRENV_WATCHES = "DIRENV_WATCHES"
+diff --git a/internal/cmd/env_diff.go b/internal/cmd/env_diff.go
+index 58f7dde..4fde9c5 100644
+--- a/internal/cmd/env_diff.go
++++ b/internal/cmd/env_diff.go
+@@ -14,6 +14,7 @@ var IgnoredKeys = map[string]bool{
+ "DIRENV_BASH": true,
+
+ // should only be available inside of the .envrc or .env
++ "DIRENV_WORKDIR": true,
+ "DIRENV_IN_ENVRC": true,
+
+ "COMP_WORDBREAKS": true, // Avoids segfaults in bash
+diff --git a/internal/cmd/env_diff_test.go b/internal/cmd/env_diff_test.go
+index 9050d97..a889094 100644
+--- a/internal/cmd/env_diff_test.go
++++ b/internal/cmd/env_diff_test.go
+@@ -41,6 +41,9 @@ func TestIgnoredEnv(t *testing.T) {
+ if !IgnoredEnv(DIRENV_BASH) {
+ t.Fail()
+ }
++ if !IgnoredEnv(DIRENV_WORKDIR) {
++ t.Fail()
++ }
+ if IgnoredEnv(DIRENV_DIFF) {
+ t.Fail()
+ }
+diff --git a/internal/cmd/rc.go b/internal/cmd/rc.go
+index 8ea8c7e..ad0f2dc 100644
+--- a/internal/cmd/rc.go
++++ b/internal/cmd/rc.go
+@@ -211,6 +211,7 @@ func (rc *RC) Load(previousEnv Env) (newEnv Env, err error) {
+ wd := config.WorkDir
+ direnv := config.SelfPath
+ newEnv = previousEnv.Copy()
++ newEnv[DIRENV_WORKDIR] = wd
+ newEnv[DIRENV_WATCHES] = rc.times.Marshal()
+ defer func() {
+ // Record directory changes even if load is disallowed or fails
+diff --git a/test/direnv-test-common.sh b/test/direnv-test-common.sh
+index e6c5ad0..edc368c 100755
+--- a/test/direnv-test-common.sh
++++ b/test/direnv-test-common.sh
+@@ -228,6 +228,13 @@ test_start "in-envrc"
+ test_eq "$es" "1"
+ test_stop
+
++test_start "workdir"
++ cd child
++ direnv_eval
++ test_eq "$ENVRC_PWD" "$TEST_DIR/scenarios/workdir"
++ test_eq "$WORKDIR_FROM_DIRENV" "$TEST_DIR/scenarios/workdir/child"
++test_stop
++
+ test_start "missing-file-source-env"
+ direnv_eval
+ test_stop
+diff --git a/test/scenarios/workdir/.envrc b/test/scenarios/workdir/.envrc
+new file mode 100644
+index 0000000..08384d3
+--- /dev/null
++++ b/test/scenarios/workdir/.envrc
+@@ -0,0 +1,2 @@
++export ENVRC_PWD=$PWD
++export WORKDIR_FROM_DIRENV=$DIRENV_WORKDIR
+diff --git a/test/scenarios/workdir/child/.keep b/test/scenarios/workdir/child/.keep
+new file mode 100644
+index 0000000..8b13789
+--- /dev/null
++++ b/test/scenarios/workdir/child/.keep
+@@ -0,0 +1 @@
++
diff --git a/nix-conf/overlays/modifications.nix b/nix-conf/overlays/modifications.nix
index 51df553..0db3709 100644
--- a/nix-conf/overlays/modifications.nix
+++ b/nix-conf/overlays/modifications.nix
@@ -21,7 +21,12 @@ in
});
direnv = prev.direnv.overrideAttrs (oldAttrs: {
patches = (oldAttrs.patches or [ ]) ++ [
- ./direnv-workdir.patch
+ (
+ if prev.lib.versionAtLeast prev.direnv.version "2.38.0" then
+ ./direnv-workdir-unstable.patch
+ else
+ ./direnv-workdir.patch
+ )
];
});
pythonPackagesExtensions =