From 5dfa9b0ee9fa5bc1fdc7dfef3f760f27104c6462 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 2 Sep 2022 23:45:57 +0200 Subject: [PATCH] firefox-esr{,-unwrapped,-wayland}: 91 -> 102 The 91 release tree has a planned end of life in 2022/09 and the 102 tree is its successor. Includes some reordering that makes more sense to me. --- pkgs/top-level/all-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ff267fbc334..2a81c02c0171 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27609,14 +27609,15 @@ with pkgs; firefox-unwrapped = firefoxPackages.firefox; firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102; firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91; + firefox-esr-unwrapped = firefoxPackages.firefox-esr-102; + firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; - firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; - firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; - firefox-esr = firefox-esr-91; - firefox-esr-unwrapped = firefoxPackages.firefox-esr-91; - firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; }; + firefox-esr = firefox-esr-102; + firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; + firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; + firefox-esr-wayland = wrapFirefox firefox-esr-102-unwrapped { forceWayland = true; }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { inherit (gnome) adwaita-icon-theme;