Merge pull request #205798 from vcunat/p/firefox-bump

This commit is contained in:
Martin Weinelt 2022-12-14 01:40:37 +01:00 committed by GitHub
commit 4c888586f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 399 additions and 399 deletions

View file

@ -220,7 +220,7 @@ buildStdenv.mkDerivation ({
"profilingPhase" "profilingPhase"
]; ];
patches = lib.optionals (lib.versionOlder version "103") [ patches = lib.optionals (lib.versionOlder version "102.6.0") [
(fetchpatch { (fetchpatch {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 # https://bugzilla.mozilla.org/show_bug.cgi?id=1773259
name = "rust-cbindgen-0.24.2-compat.patch"; name = "rust-cbindgen-0.24.2-compat.patch";
@ -234,7 +234,7 @@ buildStdenv.mkDerivation ({
postPatch = '' postPatch = ''
rm -rf obj-x86_64-pc-linux-gnu rm -rf obj-x86_64-pc-linux-gnu
patchShebangs mach patchShebangs mach build
'' ''
+ extraPostPatch; + extraPostPatch;

View file

@ -3,10 +3,10 @@
rec { rec {
firefox = buildMozillaMach rec { firefox = buildMozillaMach rec {
pname = "firefox"; pname = "firefox";
version = "107.0.1"; version = "108.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "e57e4bfcecbcc6dbe73f23577a14a2998c8c3f3d602f85ea06f99e0974e78481b9f7bdb019cb4e9733e59f56be1407edd64a2adb7b284bb4a87b46b1e2295dea"; sha512 = "fa800f62cca395a51b9a04373a27be48fc3860208e34ecf74d908127638d1eb8c41cf9898be6896777d408127d5c4b7104d9ee89c97da923b2dc6ea32186187e";
}; };
meta = { meta = {
@ -29,11 +29,11 @@ rec {
firefox-esr-102 = buildMozillaMach rec { firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102"; pname = "firefox-esr-102";
version = "102.5.0esr"; version = "102.6.0esr";
applicationName = "Mozilla Firefox ESR"; applicationName = "Mozilla Firefox ESR";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "f4e105209c61e9537ddc90afdb05ede0a31caceb9b164d96276c811abbd646d14bc246c00caa386c0b0561055096d30b298329c69270dd085b943bdbc3a91a13"; sha512 = "c0f0160bea612d0ae74c29dd44beb7fd9a1c292694b8cd5c4faf2e54feb5c27684eee821b67dd40df714d69866a4e3a8b19e22182d9bc3023050d2d96b02d308";
}; };
meta = { meta = {