From 45d853b55cd75b85a5aecac3868beb75ca7e9e1c Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Wed, 19 Aug 2026 12:17:23 +0200
Subject: modules/direnv/pre-cache: Also use the nixpkgs rev as cache key

Otherwise, we would not get a new devshell upon nixpkgs update.
---
 modules/by-name/di/direnv/module.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

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 = {
-- 
cgit v1.3.1