From 929f8ee8362aec0a2bcbcbbd485e86e701496a73 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 3 May 2025 11:40:34 -0400
Subject: [PATCH] thunderbird: deprecate darwinSetupWarning option (#6531)

nixpkgs support thunderbird for darwin now
---
 modules/programs/thunderbird.nix              | 20 +++++++++----------
 .../programs/thunderbird/thunderbird.nix      |  3 ---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index 1109fe5a..f546b2bf 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -452,11 +452,11 @@ in
         type = types.bool;
         default = true;
         example = false;
-        visible = isDarwin;
+        visible = false;
         readOnly = !isDarwin;
         description = ''
-          Warn to set environment variables before using this module. Only
-          relevant on Darwin.
+          Using programs.thunderbird.darwinSetupWarning is deprecated. The
+          module is compatible with all Thunderbird installations.
         '';
       };
     };
@@ -611,6 +611,13 @@ in
   };
 
   config = mkIf cfg.enable {
+    warnings = lib.optionals (!cfg.darwinSetupWarning) [
+      ''
+        Using programs.thunderbird.darwinSetupWarning is deprecated and will be
+        removed in the future. Thunderbird is now supported on Darwin.
+      ''
+    ];
+
     assertions = [
       (
         let
@@ -642,13 +649,6 @@ in
       )
     ];
 
-    warnings = lib.optional (isDarwin && cfg.darwinSetupWarning) ''
-      Thunderbird packages are not yet supported on Darwin. You can still use
-      this module to manage your accounts and profiles by setting
-      'programs.thunderbird.package' to a dummy value, for example using
-      'pkgs.runCommand'.
-    '';
-
     home.packages = [
       cfg.package
     ] ++ lib.optional (lib.any (p: p.withExternalGnupg) (attrValues cfg.profiles)) pkgs.gpgme;
diff --git a/tests/modules/programs/thunderbird/thunderbird.nix b/tests/modules/programs/thunderbird/thunderbird.nix
index 9f575f0b..d8215d06 100644
--- a/tests/modules/programs/thunderbird/thunderbird.nix
+++ b/tests/modules/programs/thunderbird/thunderbird.nix
@@ -64,9 +64,6 @@
       name = "thunderbird";
     };
 
-    # Disable warning so that platforms' behavior is the same
-    darwinSetupWarning = false;
-
     profiles = {
       first = {
         isDefault = true;