Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

firefox: remove options removed upstream

Browse source 
Fixes #1166
This commit is contained in:
Robert Helgesson 2020-04-18 11:21:24 +02:00
parent 133badb297
commit 3461ceebc0
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 9 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/release-notes/rl-1909.adoc
View file

@ -8,8 +8,8 @@ The 19.09 release branch became the stable branch in October, 2019.
This release has the following notable changes: This release has the following notable changes:
* The <<opt-programs.firefox.enableGoogleTalk>> and * The `programs.firefox.enableGoogleTalk` and
<<opt-programs.firefox.enableIcedTea>> options are now deprecated `programs.firefox.enableIcedTea` options are now deprecated
and will only work if Firefox ESR 52.x is used. and will only work if Firefox ESR 52.x is used.
* The `home-manager` tool now provides an `uninstall` sub-command that * The `home-manager` tool now provides an `uninstall` sub-command that

41
modules/programs/firefox.nix
View file

@ -66,6 +66,13 @@ in
{ {
meta.maintainers = [ maintainers.rycee ]; 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 = { options = {
programs.firefox = { programs.firefox = {
enable = mkEnableOption "Firefox"; enable = mkEnableOption "Firefox";
@ -193,38 +200,6 @@ in
default = false; default = false;
description = "Whether to enable the unfree Adobe Flash plugin."; 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. # The configuration expected by the Firefox wrapper.
fcfg = { fcfg = {
enableAdobeFlash = cfg.enableAdobeFlash; enableAdobeFlash = cfg.enableAdobeFlash;
enableGoogleTalkPlugin = cfg.enableGoogleTalk;
icedtea = cfg.enableIcedTea;
}; };
# A bit of hackery to force a config into the wrapper. # A bit of hackery to force a config into the wrapper.