From e5e485e73c6e28ba54af4f45ed13f80e0706418f Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Mon, 17 Feb 2025 22:16:34 -0500 Subject: [PATCH] thunderbird: separate test case for firefox+thunderbird setup Signed-off-by: Ihar Hrachyshka --- tests/modules/programs/thunderbird/default.nix | 5 ++++- .../programs/thunderbird/thunderbird-with-firefox.nix | 5 +++++ tests/modules/programs/thunderbird/thunderbird.nix | 3 --- 3 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 tests/modules/programs/thunderbird/thunderbird-with-firefox.nix diff --git a/tests/modules/programs/thunderbird/default.nix b/tests/modules/programs/thunderbird/default.nix index 487297784..a17755e16 100644 --- a/tests/modules/programs/thunderbird/default.nix +++ b/tests/modules/programs/thunderbird/default.nix @@ -1 +1,4 @@ -{ thunderbird = ./thunderbird.nix; } +{ + thunderbird = ./thunderbird.nix; + thunderbird-with-firefox = ./thunderbird-with-firefox.nix; +} diff --git a/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix b/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix new file mode 100644 index 000000000..bd1744fa8 --- /dev/null +++ b/tests/modules/programs/thunderbird/thunderbird-with-firefox.nix @@ -0,0 +1,5 @@ +# Confirm that both Firefox and Thunderbird can be configured at the same time. +{ lib, realPkgs, ... }: +lib.recursiveUpdate (import ./thunderbird.nix { inherit lib realPkgs; }) { + programs.firefox.enable = true; +} diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix index 555ea35d6..aa46b3b2d 100644 --- a/tests/modules/programs/thunderbird/thunderbird.nix +++ b/tests/modules/programs/thunderbird/thunderbird.nix @@ -37,9 +37,6 @@ }; }; - # Confirm that both Firefox and Thunderbird can be configured at the same time. - programs.firefox = { enable = true; }; - programs.thunderbird = { enable = true;