Firefox: 129.0.2 -> 130.0; 128.1.0esr -> 128.2.0esr; 115.14.0esr -> 115.15.0esr (#339285)

This commit is contained in:
Martin Weinelt 2024-09-04 02:19:30 +02:00 committed by GitHub
commit af18f59884
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 420 additions and 438 deletions

View File

@ -237,7 +237,7 @@ buildStdenv.mkDerivation {
patches = lib.optionals (lib.versionAtLeast version "111") [ ./env_var_for_system_dir-ff111.patch ]
++ lib.optionals (lib.versionAtLeast version "96" && lib.versionOlder version "121") [ ./no-buildconfig-ffx96.patch ]
++ lib.optionals (lib.versionAtLeast version "121") [ ./no-buildconfig-ffx121.patch ]
++ lib.optionals (lib.versionOlder version "131") [
++ lib.optionals (lib.versionOlder version "128" || (lib.versionAtLeast version "129" && lib.versionOlder version "130")) [
(fetchpatch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1912663
name = "cbindgen-0.27.0-compat.patch";
@ -245,24 +245,6 @@ buildStdenv.mkDerivation {
hash = "sha256-MqgWHgbDedVzDOqY2/fvCCp+bGwFBHqmaJLi/mllZug=";
})
]
++ lib.optionals (lib.versionOlder version "130" && lib.versionAtLeast version "128") [
# https://bugzilla.mozilla.org/show_bug.cgi?id=1898476
(fetchpatch {
name = "mozbz-1898476-1.patch";
url = "https://hg.mozilla.org/mozilla-central/raw-rev/f9323daf7abe";
hash = "sha256-fvIowXJLWnm16LeiSz6EasGypTi1ilG+s/T6+lNLbMQ=";
})
(fetchpatch {
name = "mozbz-1898476-2.patch";
url = "https://hg.mozilla.org/mozilla-central/raw-rev/a264ff9e9f6f";
hash = "sha256-9vkI/Ho4BXvLnoRGdfTzUODcIlA6K3RjbdhZjb/LEz0=";
})
(fetchpatch {
name = "mozbz-1898476-3.patch";
url = "https://hg.mozilla.org/mozilla-central/raw-rev/eb230ecdf8eb";
hash = "sha256-IaLltxf5W1WEzxvbi10wphqXVQPtBiLc2zlk38CIiz4=";
})
]
++ lib.optionals (lib.versionOlder version "122") [ ./bindgen-0.64-clang-18.patch ]
++ lib.optionals (lib.versionOlder version "123") [
(fetchpatch {

View File

@ -5,10 +5,10 @@
{
firefox = buildMozillaMach rec {
pname = "firefox";
version = "129.0.2";
version = "130.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "f6805a87e5cb4e437583916e3ec1b312dc73eec5fc06ce7a038b13bd7c6827b18cf383c30645d96623ce41675351f3023ec6b9f89d676f1c889994eae79f2c13";
sha512 = "d0d11b38d9e02fa15298ec13336bb086668b4f36b3ce9ced218a265327fd4822b9fea4303402631947ea3c20490c414de87f8df3e7c23d2e02b70f0456b9af40";
};
extraPatches = [
@ -96,10 +96,10 @@
firefox-esr-128 = buildMozillaMach rec {
pname = "firefox";
version = "128.1.0esr";
version = "128.2.0esr";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "8055a7f83acf0cab6124ba5809aff1c082e81a0d30ff318ec719f8fd3f4af9aa60e2094c1abd6c981193d751075a9569370176e20e50f3c1959fe27a15511388";
sha512 = "9a689929f6f86d795ea2c0318bb78f77f72a552f40715a1108dbd6361b0dedc3aaf049f1883424012459899607067d5a8374d895564591ec6679a1ce80708d7d";
};
meta = {
@ -125,11 +125,11 @@
firefox-esr-115 = (buildMozillaMach rec {
pname = "firefox-esr-115";
version = "115.14.0esr";
version = "115.15.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "dd40c1fd3cf454dbf33a85d38e47bb0e736ed89b829643653e239f43232441f4e9f3c7876f058ff2e6f19daf2b50a8f2d13274e9a107d8a258a6067d1fc43f54";
sha512 = "0df4c498c99cce08903004d2e0f9e977a19f7de86240aa82dba179b60f1d67ca3021eb474f56bddc38035e773eeb5d99bb3e1b0756d9f7583dc8e1f747f477ba";
};
meta = {