From 5c5b90fc26856b86ce8ecd87eb76742fc8022e39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 12 Jun 2024 14:32:48 +0100 Subject: [PATCH] fix #1269: respect devenv.isTesting only when modules have it --- devenv/src/flake.tmpl.nix | 2 ++ flake.nix | 1 + src/modules/flake.nix | 1 + 3 files changed, 4 insertions(+) diff --git a/devenv/src/flake.tmpl.nix b/devenv/src/flake.tmpl.nix index 28ecc3831..bcc9f7f0b 100644 --- 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 index 335aaffc4..d456b04eb 100644 --- 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 index 87544e566..369172495 100644 --- a/src/modules/flake.nix +++ b/src/modules/flake.nix @@ -2,5 +2,6 @@ outputs = { ... }: { modules = ./.; isTmpDir = true; + hasIsTesting = true; }; }