From 8de91807c079fa480d0ec004944a61e325fa35ae Mon Sep 17 00:00:00 2001 From: kxxt Date: Sun, 4 Jun 2023 18:44:26 +0800 Subject: [PATCH 1/4] firefox-devedition: change binary name and desktop entry Firefox and Firefox DevEdition shouldn't have the same binary name because it makes it hard to use these two browsers at the same time. For example, In a common use case, one use Firefox for life and use Firefox Dev Edition for web development. Update icon name to avoid name collision. --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09b5a35c308d..cc6d4bf75509 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31877,7 +31877,12 @@ with pkgs; firefox = wrapFirefox firefox-unwrapped { }; firefox-beta = wrapFirefox firefox-beta-unwrapped { }; - firefox-devedition = wrapFirefox firefox-devedition-unwrapped { }; + firefox-devedition = wrapFirefox firefox-devedition-unwrapped { + nameSuffix = "-devedition"; + desktopName = "Firefox Developer Edition"; + wmClass = "firefox-devedition"; + icon = "firefox-devedition"; + }; firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; From 0a39005deafd2dde10f0b0b721f0ee956c34f3e4 Mon Sep 17 00:00:00 2001 From: kxxt Date: Sun, 4 Jun 2023 19:31:10 +0800 Subject: [PATCH 2/4] firefox-beta: change binary name and desktop entry BTW update icon name to avoid name collision. --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc6d4bf75509..8c067b2ae9a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31876,7 +31876,12 @@ with pkgs; firefox-esr-unwrapped = firefoxPackages.firefox-esr-115; firefox = wrapFirefox firefox-unwrapped { }; - firefox-beta = wrapFirefox firefox-beta-unwrapped { }; + firefox-beta = wrapFirefox firefox-beta-unwrapped { + nameSuffix = "-beta"; + desktopName = "Firefox Beta"; + wmClass = "firefox-beta"; + icon = "firefox-beta"; + }; firefox-devedition = wrapFirefox firefox-devedition-unwrapped { nameSuffix = "-devedition"; desktopName = "Firefox Developer Edition"; From 23b33e39cc33ad034a647ae575e7fa1960179aa7 Mon Sep 17 00:00:00 2001 From: kxxt Date: Sun, 4 Jun 2023 19:32:53 +0800 Subject: [PATCH 3/4] firefox-esr: change binary name and desktop entry BTW Update icon name to avoid name collision. --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c067b2ae9a9..b9075700683f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31892,7 +31892,12 @@ with pkgs; firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; firefox-esr = firefox-esr-115; - firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { }; + firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { + nameSuffix = "-esr"; + desktopName = "Firefox ESR"; + wmClass = "firefox-esr"; + icon = "firefox-esr"; + }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { inherit (gnome) adwaita-icon-theme; From d7bccab0bf72b952fde6e17c8da9f606f1e55dd2 Mon Sep 17 00:00:00 2001 From: kxxt Date: Sun, 4 Jun 2023 19:40:54 +0800 Subject: [PATCH 4/4] release-note: change binary name and desktop entry for firefox-* The executable file names for `firefox-devedition`, `firefox-beta`, `firefox-esr` now matches their package names, which is consistent with the`firefox-*-bin` packages. The desktop entries are also updated so that you can have multiple editions of firefox in your app launcher. --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index d238e92271c5..b30c51d7d7f9 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -80,6 +80,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m `CONFIG_FILE_NAME` includes `bpf_pinning`, `ematch_map`, `group`, `nl_protos`, `rt_dsfield`, `rt_protos`, `rt_realms`, `rt_scopes`, and `rt_tables`. +- The executable file names for `firefox-devedition`, `firefox-beta`, `firefox-esr` now matches their package names, which is consistent with the `firefox-*-bin` packages. The desktop entries are also updated so that you can have multiple editions of firefox in your app launcher. + - The `systemd.oomd` module behavior is changed as: - Raise ManagedOOMMemoryPressureLimit from 50% to 80%. This should make systemd-oomd kill things less often, and fix issues like [this](https://pagure.io/fedora-workstation/issue/358).