nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-29 19:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Firefox: 156.0.1 -> 157.0; 153.3.0esr -> 153.4.0esr; drop 140esr (#567873)

Browse Source
This commit is contained in:
Martin Weinelt
2026-09-28 21:03:46 +00:00
committed by GitHub
parent 12e5c0fd41 1500f776c8
commit 2ce392d342
10 changed files with 633 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

File diff suppressed because it is too large Load Diff

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

@@ -1,50 +0,0 @@
{
lib,
callPackage,
fetchurl,
nixosTests,
buildMozillaMach,
}:
buildMozillaMach rec {
pname = "firefox";
version = "140.16.0esr";
applicationName = "Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "fabf5b481594a9a860b6ae379d2ee89ba291b807c94334ee15bad1fe862edb47c22e890d892e33d6a6ec57fce4ab12aa9c9c6fa4a501b881ecc6211ac04bd9a0";
};
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;
maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115)
license = lib.licenses.mpl20;
mainProgram = "firefox";
identifiers = {
cpeParts = {
product = "firefox";
sw_edition = "esr";
update = "*";
vendor = "mozilla";
version = lib.removeSuffix "esr" version;
};
purlParts = {
type = "generic";
spec = "firefox@${lib.removeSuffix "esr" version}";
};
};
broken = true; # doesn't build on glibc 2.44
};
tests = {
inherit (nixosTests) firefox-esr-140;
};
updateScript = callPackage ../update.nix {
attrPath = "firefox-esr-140-unwrapped";
versionPrefix = "140";
versionSuffix = "esr";
};
}

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

@@ -8,11 +8,11 @@
buildMozillaMach rec {
pname = "firefox";
version = "153.3.0esr";
version = "153.4.0esr";
applicationName = "Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "56a5e092f0aba91febf01d227e8068520513f632d09c5ffbad4cbb2de307d9066425f353a1b7fcf5648733e02a9b17cfc9aaed5e39d7562a6b143b1c9827a668";
sha512 = "79e1f2a0f8c4d156c80b8f4c580aa944600d49cc811f961a3eca251113241638991fda94ccb74a44df9030f643586c41686861333288f13793e621a262a1b131";
};
meta = {

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

@@ -9,10 +9,10 @@
buildMozillaMach rec {
pname = "firefox";
version = "156.0.1";
version = "157.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "80a32a79268b672206f5477ca6bfde620cb7419b27aac090e01f06df06990ee0bbd81bb5c4aa78ac1d0edb26b133b1c6fa11cb6522445eccd70c82e719a24d5b";
sha512 = "d0c1788102904fe83bfbeecdbdfbd4033743e9bb791ff7063ca4a2a72146c722e0c87fb7531b32be9491f5b1529960364197150c27742e0aea3cefcd13ed0dde";
};
meta = {

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

@@ -511,8 +511,10 @@ buildStdenv.mkDerivation {
++ lib.optionals (!buildStdenv.hostPlatform.isDarwin && lib.versionAtLeast version "141") [
"--with-onnx-runtime=${lib.getLib onnxruntime}/lib"
]
++ [
++ lib.optionals (lib.versionOlder version "157") [
(enableFeature withFFmpeg "ffmpeg")
]
++ [
(enableFeature withGSSAPI "negotiateauth")
(enableFeature withJemalloc "jemalloc")

6
pkgs/by-name/zo/zotero/package.nix
View File

@@ -15,7 +15,7 @@
pkg-config,
pango,
giflib,
firefox-esr-140-unwrapped,
firefox-esr-153-unwrapped,
makeDesktopItem,
copyDesktopItems,
libGL,
@@ -253,10 +253,10 @@ buildNpmPackage (finalAttrs: {
mkdir -p app/xulrunner/
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
cp -r "${firefox-esr-140-unwrapped}/Applications/Firefox ESR.app" app/xulrunner/Firefox.app
cp -r "${firefox-esr-153-unwrapped}/Applications/Firefox ESR.app" app/xulrunner/Firefox.app
''
+ lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
cp -r "${firefox-esr-140-unwrapped}/lib/firefox" "app/xulrunner/firefox-${stdenv.hostPlatform.parsed.kernel.name}-${
cp -r "${firefox-esr-153-unwrapped}/lib/firefox" "app/xulrunner/firefox-${stdenv.hostPlatform.parsed.kernel.name}-${
lib.replaceString "aarch64" "arm64" stdenv.hostPlatform.parsed.cpu.name
}"
''

4
pkgs/development/libraries/nss/latest.nix
View File

@@ -5,8 +5,8 @@
# Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert
import ./generic.nix {
version = "3.129";
hash = "sha256-cy7+nCVtogr1onk8/8OQcQZUm2AH2azNsUmVFg4ym7k=";
version = "3.130";
hash = "sha256-+VONkBLHqJzIufh7VCvZfGUJflOAzBemhS3z3aB8cqY=";
filename = "latest.nix";
versionRegex = "NSS_(\\d+)_(\\d+)(?:_(\\d+))?_RTM";
}

2
pkgs/top-level/aliases.nix
View File

@@ -856,6 +856,8 @@ mapAliases {
firefox-devedition-bin = warnAlias "`firefox-devedition-bin` is removed. Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition; # Added 2025-06-06
firefox-esr-128 = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-140` instead."; # Added 2025-08-21
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."; # Added 2025-08-21
firefox-esr-140 = throw "The Firefox 140 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-153` instead."; # Added 2026-09-28
firefox-esr-140-unwrapped = throw "The Firefox 140 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-153-unwrapped` instead."; # Added 2026-09-28
firefox-wayland = throw "'firefox-wayland' has been renamed to/replaced by 'firefox'"; # Converted to throw 2025-10-27
firmwareLinuxNonfree = throw "'firmwareLinuxNonfree' has been renamed to/replaced by 'linux-firmware'"; # Converted to throw 2025-10-27
fishfight = throw "'fishfight' has been renamed to/replaced by 'jumpy'"; # Converted to throw 2025-10-27

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

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