aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2026-08-19 12:17:23 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2026-08-19 12:17:23 +0200
commit45d853b55cd75b85a5aecac3868beb75ca7e9e1c (patch)
tree164337cf598574d38e261f60c23d756f85d67fec
parentnpins/sources.json: Update (diff)
downloadnixos-config-45d853b55cd75b85a5aecac3868beb75ca7e9e1c.zip
modules/direnv/pre-cache: Also use the nixpkgs rev as cache key
Otherwise, we would not get a new devshell upon nixpkgs update.
-rw-r--r--modules/by-name/di/direnv/module.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/by-name/di/direnv/module.nix b/modules/by-name/di/direnv/module.nix
index 31c70dad..55a694cf 100644
--- a/modules/by-name/di/direnv/module.nix
+++ b/modules/by-name/di/direnv/module.nix
@@ -17,14 +17,14 @@
cfg = config.soispha.programs.direnv;
devshells = sources.loadFlake "devshells";
+ nixpkgs = sources.loadFlake "nixpkgs";
pre-cache = pkgs.runCommand "pre-cache.sh" {} ''
cat "${./pre-cache.sh}" > $out
substituteInPlace $out \
--replace-fail "%DEVSHELLS_REPO%" "${devshells}" \
- --replace-fail "%DEVSHELLS_REPO_REF%" "${devshells.sourceInfo.rev}"
-
+ --replace-fail "%DEVSHELLS_REPO_REF%" "${devshells.sourceInfo.rev}.${builtins.readFile "${nixpkgs}/.git-revision"}"
'';
in {
options.soispha.programs.direnv = {