firefoxPackages.*, firefox-esr*, icecat: add aliases

This commit is contained in:
Florian Klink 2020-02-04 23:08:51 +01:00
parent 94b2596540
commit 84af9839e0
3 changed files with 10 additions and 9 deletions

View file

@ -62,8 +62,9 @@ rec {
};
};
} // lib.optionalAttrs (config.allowAliases or true) {
# ALIASES
# remove after 20.03 branchoff
#### ALIASES
#### remove after 20.03 branchoff
firefox-esr-52 = throw ''
firefoxPackages.firefox-esr-52 was removed as it's an unsupported ESR with
open security issues. If you need it because you need to run some plugins

View file

@ -117,6 +117,13 @@ mapAliases ({
firefox-esr-wrapper = firefox-esr; # 2016-01
firefox-wrapper = firefox; # 2016-01
firefoxWrapper = firefox; # 2015-09
firefox-esr-52 = firefoxPackages.firefox-esr-52; # 2020-02, remove after 20.03 branchoff
firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52; # 2020-02, remove after 20.03 branchoff
firefox-esr-60 = firefoxPackages.firefox-esr-60; # 2020-02, remove after 20.03 branchoff
firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60; # 2020-02, remove after 20.03 branchoff
icecat = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff
icecat-unwrapped = firefoxPackages.icecat; # 2020-02, remove after 20.03 branchoff
firestr = throw "firestr has been removed."; # added 2019-12-08
flameGraph = flamegraph; # added 2018-04-25
font-awesome-ttf = font-awesome; # 2018-02-25

View file

@ -19123,18 +19123,11 @@ in
});
firefox-unwrapped = firefoxPackages.firefox;
firefox-esr-52-unwrapped = firefoxPackages.firefox-esr-52;
firefox-esr-60-unwrapped = firefoxPackages.firefox-esr-60;
firefox-esr-68-unwrapped = firefoxPackages.firefox-esr-68;
icecat-unwrapped = firefoxPackages.icecat;
firefox = wrapFirefox firefox-unwrapped { };
firefox-wayland = wrapFirefox firefox-unwrapped { gdkWayland = true; };
firefox-esr-52 = wrapFirefox firefox-esr-52-unwrapped { };
firefox-esr-60 = wrapFirefox firefox-esr-60-unwrapped { };
firefox-esr-68 = wrapFirefox firefox-esr-68-unwrapped { };
firefox-esr = firefox-esr-68;
icecat = wrapFirefox icecat-unwrapped { };
firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
channel = "release";