diff --git a/modules/programs/mergiraf.nix b/modules/programs/mergiraf.nix index 9b17b6d5..113d554c 100644 --- a/modules/programs/mergiraf.nix +++ b/modules/programs/mergiraf.nix @@ -53,6 +53,7 @@ in lib.optionals ( cfg.enable + && config.programs.git.enable && !lib.versionAtLeast config.home.stateVersion "26.05" && options.programs.mergiraf.enableGitIntegration.highestPrio >= 1500 ) @@ -68,6 +69,7 @@ in lib.optionals ( cfg.enable + && config.programs.jujutsu.enable && !lib.versionAtLeast config.home.stateVersion "26.05" && options.programs.mergiraf.enableJujutsuIntegration.highestPrio >= 1500 ) diff --git a/tests/modules/programs/mergiraf/legacy-warnings.nix b/tests/modules/programs/mergiraf/legacy-warnings.nix index 53885121..645be8c3 100644 --- a/tests/modules/programs/mergiraf/legacy-warnings.nix +++ b/tests/modules/programs/mergiraf/legacy-warnings.nix @@ -1,6 +1,14 @@ { - programs.mergiraf = { - enable = true; + programs = { + mergiraf = { + enable = true; + }; + git = { + enable = true; + }; + jujutsu = { + enable = true; + }; }; test.asserts.warnings.expected = [