fix #1269: respect devenv.isTesting only when modules have it

cachix · Jun 12, 2024 · 5c5b90f · 5c5b90f
1 parent c306331
commit 5c5b90f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/devenv/src/flake.tmpl.nix b/devenv/src/flake.tmpl.nix
@@ -70,6 +70,8 @@
               (pkgs.lib.optionalAttrs (inputs.devenv.isTmpDir or false) {
                 devenv.tmpdir = devenv_tmpdir;
                 devenv.runtime = devenv_runtime;
+              })
+              (pkgs.lib.optionalAttrs (inputs.devenv.hasIsTesting or false) {
                 devenv.isTesting = devenv_istesting;
               })
               (pkgs.lib.optionalAttrs (container_name != null) {

diff --git a/flake.nix b/flake.nix
@@ -91,6 +91,7 @@
 
       modules = ./src/modules;
       isTmpDir = true;
+      hasIsTesting = true;
 
       templates =
         let

diff --git a/src/modules/flake.nix b/src/modules/flake.nix
@@ -2,5 +2,6 @@
   outputs = { ... }: {
     modules = ./.;
     isTmpDir = true;
+    hasIsTesting = true;
   };
 }