diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-08-17 22:27:54 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2026-08-17 22:27:54 +0200 |
| commit | aa55de1820a5ae27ac32b9b0e33b18ae592b46fb (patch) | |
| tree | 3588105ee84d057c90b3ff2ff18d5d4e50fc4afc /pkgs | |
| parent | treewide: Update (diff) | |
| download | nixos-config-aa55de1820a5ae27ac32b9b0e33b18ae592b46fb.zip | |
modules/direnv: Implement pre-cached devshells
That means, that the devshells are only build once and centrally
updated. Ideally, they would be built upon system update, but I haven't
figured out a way to run `nix print-dev-env` in a nix build sandbox yet
(and hope, that it's not necessary anymore once, that functionality
moves to nixpkgs' `mkShell`).
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/by-name/di/direnv-patched/0001-rc-Also-consider-.nenvrc-files.patch | 28 | ||||
| -rw-r--r-- | pkgs/by-name/di/direnv-patched/package.nix | 10 |
2 files changed, 38 insertions, 0 deletions
diff --git a/pkgs/by-name/di/direnv-patched/0001-rc-Also-consider-.nenvrc-files.patch b/pkgs/by-name/di/direnv-patched/0001-rc-Also-consider-.nenvrc-files.patch new file mode 100644 index 00000000..fa2716f4 --- /dev/null +++ b/pkgs/by-name/di/direnv-patched/0001-rc-Also-consider-.nenvrc-files.patch @@ -0,0 +1,28 @@ +From c7fd4ebf40f2cec9ce23c4227fc48402c0469e69 Mon Sep 17 00:00:00 2001 +From: Benedikt Peetz <benedikt.peetz@b-peetz.de> +Date: Thu, 13 Aug 2026 17:47:06 +0200 +Subject: [PATCH] rc: Also consider `.nenvrc` files + +--- + internal/cmd/rc.go | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/internal/cmd/rc.go b/internal/cmd/rc.go +index 4167ecf..d7f5886 100644 +--- a/internal/cmd/rc.go ++++ b/internal/cmd/rc.go +@@ -391,9 +391,9 @@ func allow(path string, allowPath string) (err error) { + + func findEnvUp(searchDir string, loadDotenv bool) (path string) { + if loadDotenv { +- return findUp(searchDir, ".envrc", ".env") ++ return findUp(searchDir, ".envrc", ".nenvrc", ".env") + } +- return findUp(searchDir, ".envrc") ++ return findUp(searchDir, ".envrc", ".nenvrc") + } + + func findUp(searchDir string, fileNames ...string) (path string) { +-- +2.55.0 + diff --git a/pkgs/by-name/di/direnv-patched/package.nix b/pkgs/by-name/di/direnv-patched/package.nix new file mode 100644 index 00000000..64f55bba --- /dev/null +++ b/pkgs/by-name/di/direnv-patched/package.nix @@ -0,0 +1,10 @@ +{direnv}: +direnv.overrideAttrs (final: prev: { + pname = "${prev.pname}-patched"; + + patches = + (prev.patches or []) + ++ [ + ./0001-rc-Also-consider-.nenvrc-files.patch + ]; +}) |