From 3461ceebc01169f99362ab5cc62d26224e7886d9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 18 Apr 2020 11:21:24 +0200
Subject: [PATCH] firefox: remove options removed upstream

Fixes #1166
---
 doc/release-notes/rl-1909.adoc |  4 ++--
 modules/programs/firefox.nix   | 41 ++++++----------------------------
 2 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/doc/release-notes/rl-1909.adoc b/doc/release-notes/rl-1909.adoc
index 2cc90c164..89bbbdc2b 100644
--- a/doc/release-notes/rl-1909.adoc
+++ b/doc/release-notes/rl-1909.adoc
@@ -8,8 +8,8 @@ The 19.09 release branch became the stable branch in October, 2019.
 
 This release has the following notable changes:
 
-* The <<opt-programs.firefox.enableGoogleTalk>> and
-  <<opt-programs.firefox.enableIcedTea>> options are now deprecated
+* The `programs.firefox.enableGoogleTalk` and
+  `programs.firefox.enableIcedTea` options are now deprecated
   and will only work if Firefox ESR 52.x is used.
 
 * The `home-manager` tool now provides an `uninstall` sub-command that
diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index 5380c9e88..582143e7d 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -66,6 +66,13 @@ in
 {
   meta.maintainers = [ maintainers.rycee ];
 
+  imports = [
+    (mkRemovedOptionModule ["programs" "firefox" "enableGoogleTalk"]
+      "Support for this option has been removed.")
+    (mkRemovedOptionModule ["programs" "firefox" "enableIcedTea"]
+      "Support for this option has been removed.")
+  ];
+
   options = {
     programs.firefox = {
       enable = mkEnableOption "Firefox";
@@ -193,38 +200,6 @@ in
         default = false;
         description = "Whether to enable the unfree Adobe Flash plugin.";
       };
-
-      enableGoogleTalk = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable the unfree Google Talk plugin. This option
-          is <emphasis>deprecated</emphasis> and will only work if
-
-          <programlisting language="nix">
-          programs.firefox.package = pkgs.firefox-esr-52-unwrapped;
-          </programlisting>
-
-          and the <option>plugin.load_flash_only</option> Firefox
-          option has been disabled.
-        '';
-      };
-
-      enableIcedTea = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to enable the Java applet plugin. This option is
-          <emphasis>deprecated</emphasis> and will only work if
-
-          <programlisting language="nix">
-          programs.firefox.package = pkgs.firefox-esr-52-unwrapped;
-          </programlisting>
-
-          and the <option>plugin.load_flash_only</option> Firefox
-          option has been disabled.
-        '';
-      };
     };
   };
 
@@ -267,8 +242,6 @@ in
         # The configuration expected by the Firefox wrapper.
         fcfg = {
           enableAdobeFlash = cfg.enableAdobeFlash;
-          enableGoogleTalkPlugin = cfg.enableGoogleTalk;
-          icedtea = cfg.enableIcedTea;
         };
 
         # A bit of hackery to force a config into the wrapper.