From 31bb42981662d7e9649776eaa8adead9b066b6c7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 21 Aug 2025 00:42:17 +0200 Subject: [PATCH 1/2] thunderbird-unwrapped: 141.0 -> 142.0 https://www.thunderbird.net/en-US/thunderbird/142.0/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2025-70/ Fixes: CVE-2025-9179, CVE-2025-9180, CVE-2025-9181, CVE-2025-9182, CVE-2025-9187, CVE-2025-9184, CVE-2025-9185 (cherry picked from commit 4baea46864423ed94901f8d31571f03b38c6aafe) --- .../networking/mailreaders/thunderbird/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index eadf28ea4291..71f7c570700f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -94,8 +94,8 @@ rec { thunderbird = thunderbird-latest; thunderbird-latest = common { - version = "141.0"; - sha512 = "cd747c0831532f90685975567102d1bdb90a780e21209fe4b7bddf2d84ac88576766706e95e22043a30a8a89b6d3daffb56a68c3ccc4a300b8236b20d4fca675"; + version = "142.0"; + sha512 = "9a871846fc395c69688310dbf4a4569b75d3b2952a34ba1f7dc9ef5a60a34bd740087b4abb2a1a4d522dfa9d6640f2f4fcc9972a2b72160d1ed3e0df71c2901c"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-latest"; From db4374534894ded7ab6355941716e7c9ea1577fc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 21 Aug 2025 01:00:35 +0200 Subject: [PATCH 2/2] firefox-esr-128-unwrapped: drop (cherry picked from commit 5cdd66b7df72e263b3e57974fb6bdd7e423c8588) --- nixos/tests/all-tests.nix | 4 -- .../firefox/packages/firefox-esr-128.nix | 40 ------------------- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 17 -------- 4 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b339154ad8a1..a7e6f9cf9036 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -488,10 +488,6 @@ in imports = [ ./firefox.nix ]; _module.args.firefoxPackage = pkgs.firefox-esr; }; - firefox-esr-128 = runTest { - imports = [ ./firefox.nix ]; - _module.args.firefoxPackage = pkgs.firefox-esr-128; - }; firefox-esr-140 = runTest { imports = [ ./firefox.nix ]; _module.args.firefoxPackage = pkgs.firefox-esr-140; diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix deleted file mode 100644 index 96719a7734ed..000000000000 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-128.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - stdenv, - lib, - callPackage, - fetchurl, - nixosTests, - buildMozillaMach, -}: - -buildMozillaMach rec { - pname = "firefox"; - version = "128.13.0esr"; - applicationName = "Firefox ESR"; - src = fetchurl { - url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "9e6f3af535e0904219bcac947d458789cc43cbfaf476ac287328323662391eaaadeff57b244599acf3626a2fadc0bc41b70d07e33ca6af4412006ad01ceff034"; - }; - - meta = { - changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/"; - description = "Web browser built from Firefox source tree"; - homepage = "http://www.mozilla.com/en-US/firefox/"; - maintainers = with lib.maintainers; [ hexa ]; - platforms = lib.platforms.unix; - broken = stdenv.buildPlatform.is32bit; - # since Firefox 60, build on 32-bit platforms fails with "out of memory". - # not in `badPlatforms` because cross-compilation on 64-bit machine might work. - maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) - license = lib.licenses.mpl20; - mainProgram = "firefox"; - }; - tests = { - inherit (nixosTests) firefox-esr-128; - }; - updateScript = callPackage ../update.nix { - attrPath = "firefox-esr-128-unwrapped"; - versionPrefix = "128"; - versionSuffix = "esr"; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index da7ca3946cb1..63cc7bf45a80 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -654,6 +654,8 @@ mapAliases { firefox-devedition-bin = lib.warnOnInstantiate "`firefox-devedition-bin` is removed. Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition; firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead."; firefox-esr-115-unwrapped = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-128-unwrapped` instead."; + firefox-esr-128 = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-140` instead."; + firefox-esr-128-unwrapped = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-140-unwrapped` instead."; firefox-wayland = firefox; # Added 2022-11-15 firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09 fishfight = jumpy; # Added 2022-08-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e51b6289ce9..24a187dc4b9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12478,18 +12478,6 @@ with pkgs; buildMozillaMach ; }; - firefox-esr-128-unwrapped = - import ../applications/networking/browsers/firefox/packages/firefox-esr-128.nix - { - inherit - stdenv - lib - callPackage - fetchurl - nixosTests - buildMozillaMach - ; - }; firefox-esr-140-unwrapped = import ../applications/networking/browsers/firefox/packages/firefox-esr-140.nix { @@ -12510,11 +12498,6 @@ with pkgs; firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; - firefox-esr-128 = wrapFirefox firefox-esr-128-unwrapped { - nameSuffix = "-esr"; - wmClass = "firefox-esr"; - icon = "firefox-esr"; - }; firefox-esr-140 = wrapFirefox firefox-esr-140-unwrapped { nameSuffix = "-esr"; wmClass = "firefox-esr";