Firefox: 150.0.3 -> 151.0; 140.10.2esr -> 140.11.0esr (#521564)
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -9,11 +9,11 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "140.10.2esr";
|
||||
version = "140.11.0esr";
|
||||
applicationName = "Firefox ESR";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "bda7d5e6d59a2ad310e3f3e6e8ec05c78222edce266671d5d454dfa3e8f0086add3b9c0099db907cb62b2587ed47026ba7b3aa4f0406693d142d8d91b818d551";
|
||||
sha512 = "d06adb3ef4de1324e3d61872d70de31ab08ac013f33903549bed28c6ebcc5b4dee94bb36388282c1935d77d1a564079f3adbf08d6bb80284a899cbb3d861300c";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
|
||||
buildMozillaMach rec {
|
||||
pname = "firefox";
|
||||
version = "150.0.3";
|
||||
version = "151.0";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "8452da61200f8ee66790d3fff230ca84b2ac9291af2b57e018486c50f938c53c6fb4943fe6cfe1e99b9783466fb00bf707fa006293753ac698618fc1e3b70a4a";
|
||||
sha512 = "5e6b01236c6aad17889c1d33614637a13e41d659c3306b2dadf13ab50d91a36d1269fae6d405d31351e4defe589f47f31c0798b66ad87438720f5779bcb90401";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -332,14 +332,31 @@ buildStdenv.mkDerivation {
|
||||
# https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
|
||||
./139-wayland-drag-animation.patch
|
||||
]
|
||||
# Revert apple sdk bump to 26.1 and 26.2
|
||||
# Revert apple sdk bump to 26.1, 26.2 and 26.4
|
||||
++
|
||||
lib.optionals (lib.versionAtLeast version "151" && lib.versionOlder apple-sdk_26.version "26.4")
|
||||
[
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mozilla-firefox/firefox/commit/d06b47c9e398ceb04193f904e090f23a5a1f4906.patch";
|
||||
hash = "sha256-N458KSOOiotmji5VjgdbhueZ3yTVx47UtsWnmOe8XFQ=";
|
||||
revert = true;
|
||||
includes = [
|
||||
"build/moz.configure/toolchain.configure"
|
||||
"python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist"
|
||||
];
|
||||
})
|
||||
]
|
||||
++
|
||||
lib.optionals (lib.versionAtLeast version "148" && lib.versionOlder apple-sdk_26.version "26.2")
|
||||
[
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mozilla-firefox/firefox/commit/73cbb9ff0fdbf8b13f38d078ce01ef6ec0794f9c.patch";
|
||||
hash = "sha256-ghdddJxsaxXzLZpOOfwss+2S/UUcbLqKGzWWqKy9h/k=";
|
||||
hash = "sha256-3eBhCuiT61pbeCrvK13vg0OFV4gn/JTvsGXmLN4MBTQ=";
|
||||
revert = true;
|
||||
includes = [
|
||||
"build/moz.configure/toolchain.configure"
|
||||
"python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist"
|
||||
];
|
||||
})
|
||||
]
|
||||
++
|
||||
@@ -347,8 +364,12 @@ buildStdenv.mkDerivation {
|
||||
[
|
||||
(fetchpatch {
|
||||
url = "https://github.com/mozilla-firefox/firefox/commit/c1cd0d56e047a40afb2a59a56e1fd8043e448e05.patch";
|
||||
hash = "sha256-bFHLy3b0jOcROqltIwHwSAqWYve8OZHbiPMOdhLUCLc=";
|
||||
hash = "sha256-NPaA5tYz3BUxB2ads5HZyYWJ+aS9pTzQp+AKFkfmdXA=";
|
||||
revert = true;
|
||||
includes = [
|
||||
"build/moz.configure/toolchain.configure"
|
||||
"python/mozbuild/mozbuild/test/configure/macos_fake_sdk/SDKSettings.plist"
|
||||
];
|
||||
})
|
||||
]
|
||||
++ extraPatches;
|
||||
|
||||
Reference in New Issue
Block a user