diff options
| author | Florian Klink <flokli@flokli.de> | 2020-02-04 23:08:51 +0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-02-09 22:33:33 +0100 |
| commit | 84af9839e0295e313ebf2a9f3fb2989775c7a0df (patch) | |
| tree | 5844f6677f536417c8965740039d97dcd6b57dd1 | |
| parent | 94b2596540cd2e7186f4e4fa1f43df0bfb755987 (diff) | |
firefoxPackages.*, firefox-esr*, icecat: add aliases
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/aliases.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
3 files changed, 10 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 49a9d7620476..c61483c67721 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -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 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4ee74a0f58e0..f5ee54de2149 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 361b30a187f7..817f80a7dfd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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"; |