nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 16:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-26.05] Firefox: 152.0.6 -> 153.0; 140.12.0esr -> 140.13.0esr; init at 153.0esr (#543885)

Browse Source
This commit is contained in:
Martin Weinelt
2026-07-20 23:40:58 +02:00
committed by GitHub
parent 528b7e6878 1f20939dc5
commit 9ba79f88f3
7 changed files with 693 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/tests/all-tests.nix
View File

@@ -588,6 +588,10 @@ in
imports = [ ./firefox.nix ];
_module.args.firefoxPackage = pkgs.firefox-esr-140;
};
firefox-esr-153 = runTest {
imports = [ ./firefox.nix ];
_module.args.firefoxPackage = pkgs.firefox-esr-153;
};
firefox-syncserver = runTest ./firefox-syncserver.nix;
firefox_decrypt = runTest ./firefox_decrypt.nix;
firefoxpwa = runTest ./firefoxpwa.nix;

1238
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

4
pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix
View File

@@ -9,11 +9,11 @@
buildMozillaMach rec {
pname = "firefox";
version = "140.12.0esr";
version = "140.13.0esr";
applicationName = "Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "3d598dd964bca074d11b71f84d586811b0a736bdd4d1e6cedb9286c56b1e11584e85ca1d0369c9b2f8d9e4d0eaf014d1b9232a96e71ac25f71fa9ed0807f642d";
sha512 = "937a4103d71c5e1e4bf051821729f6ea70b5c18d444930a487695cc23d74712a0134047248f6ac02305e01becb705426a55b9d89739f02a01eda01ecf5bc27f1";
};
meta = {

37
pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix Normal file
View File

@@ -0,0 +1,37 @@
{
lib,
callPackage,
fetchurl,
nixosTests,
buildMozillaMach,
}:
buildMozillaMach rec {
pname = "firefox";
version = "153.0esr";
applicationName = "Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "3ea7956ef2fdcaa86430ef922f04484cbb1a3faf447e035107159fcd5ecd8d0a0e4507a332fc3d7b66e4308c38733bd0624affd7629447b89c655a9ea0fb0936";
};
meta = {
changelog = "https://www.firefox.com/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;
badPlatforms = [ lib.systems.inspect.patterns.is32bit ];
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
license = lib.licenses.mpl20;
mainProgram = "firefox";
};
tests = {
inherit (nixosTests) firefox-esr-153;
};
updateScript = callPackage ../update.nix {
attrPath = "firefox-esr-153-unwrapped";
versionPrefix = "153";
versionSuffix = "esr";
};
}

4
pkgs/applications/networking/browsers/firefox/packages/firefox.nix
View File

@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "152.0.6";
version = "153.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "c4d877837d7007fb611c38d49d9b6dd3bc4c5c9ca900b54e722e140ce7ecd0924f69b5cedc7f8c1fe602e7efe1d7159b019de27999e29235cd631821bb13e6b0";
sha512 = "a1af5866e1c9a732818123f2f041bfd5993d093e96dd743b583312fb11d2b39d429df750f9ec22ded64b58a209bb1ecabc7aaf73057d7a64c7349e4da043d66d";
};
meta = {

13
pkgs/build-support/build-mozilla-mach/default.nix
View File

@@ -348,6 +348,19 @@ buildStdenv.mkDerivation {
# https://bugzilla.mozilla.org/show_bug.cgi?id=2046162
./153-cbindgen-0.29.4-compat.patch
]
++
lib.optionals (lib.versionAtLeast version "153" && lib.versionOlder apple-sdk_26.version "26.5")
[
(fetchpatch {
url = "https://github.com/mozilla-firefox/firefox/commit/aeec1ac9fb000105dac8eb7b20de817c5fc231b9.patch";
hash = "sha256-gF4zten+A1kgt2EMXQx77Q6vO+s26ZijgkNAJEZ+aUw=";
revert = true;
includes = [
"build/moz.configure/toolchain.configure"
"python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist"
];
})
]
++ extraPatches;
postPatch = ''

16
pkgs/top-level/all-packages.nix
View File

@@ -9018,6 +9018,17 @@ with pkgs;
buildMozillaMach
;
};
firefox-esr-153-unwrapped =
import ../applications/networking/browsers/firefox/packages/firefox-esr-153.nix
{
inherit
lib
callPackage
fetchurl
nixosTests
buildMozillaMach
;
};
firefox-esr-140-unwrapped =
import ../applications/networking/browsers/firefox/packages/firefox-esr-140.nix
{
@@ -9038,6 +9049,11 @@ with pkgs;
firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { };
firefox-esr-153 = wrapFirefox firefox-esr-153-unwrapped {
nameSuffix = "-esr";
wmClass = "firefox-esr";
icon = "firefox-esr";
};
firefox-esr-140 = wrapFirefox firefox-esr-140-unwrapped {
nameSuffix = "-esr";
wmClass = "firefox-esr";