git.iko.soy/typeable/nixpkgs
on master help sign in
firefox: 83.0 -> 84.0
commit26e0135eeda6a1935b5f72dbbad8cbd4f5b7dd74 authorajs124 <git@ajs124.de> dateWed 16 Dec 2020, 16:58 (6 years ago) parent8d4d8ef
3 files changed+29−20
pkgs/applications/networking/browsers/firefox/common.nix+2−7 pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patch+25 pkgs/applications/networking/browsers/firefox/packages.nix+2−13
pkgs/applications/networking/browsers/firefox/common.nix+2−7
@@ -118,8 +118,9 @@ buildStdenv.mkDerivation ({
118118
119119 patches = [
120120 ./env_var_for_system_dir.patch
121− ./no-buildconfig-ffx76.patch
122121 ] ++
122+ lib.optional (lib.versionOlder ffversion "83") ./no-buildconfig-ffx76.patch ++
123+ lib.optional (lib.versionAtLeast ffversion "84") ./no-buildconfig-ffx84.patch ++
123124
124125 # there are two flavors of pipewire support
125126 # The patches for the ESR release and the patches for the current stable
@@ -141,13 +142,7 @@ buildStdenv.mkDerivation ({
141142 url = "https://src.fedoraproject.org/rpms/firefox/raw/${fedora_revision}/f/${spec.name}";
142143 };
143144 in map mkPWPatch [
144− { name = "pw1.patch"; sha256 = "1a7zvngn3k7dg886zmi38kmrsdzh2rrr46aw59bhr1gfmq8wlwn0"; }
145− { name = "pw2.patch"; sha256 = "17irg3yb2mchcy0z0nr4k65mwvkps467cvvczr10fnm06lhkhw1l"; }
146− { name = "pw3.patch"; sha256 = "12p6ql5ff2lfzlni6xkpz63h2xr6n2a9zf8hhjl99fj56rif6706"; }
147− { name = "pw4.patch"; sha256 = "0rvysc92rdm98s47w5lvbnrklrf7d299k3918qnldniyb4b9p4mg"; }
148− { name = "pw5.patch"; sha256 = "0kk2yxq4qkfwc4px6m08jrn18a7a7dhrngfiaw84r9ga6sgn0z00"; }
149145 { name = "pw6.patch"; sha256 = "12lhx9wjpw0ahbfmw07wsx76bb223mr453q9cg8cq951vyskch3s"; }
150− { name = "pw7.patch"; sha256 = "0afw7cfd48vn62zb9y5kd2l26fg44s3aq1kyg3gm4q3rj34xidf6"; }
151146 ])
152147
153148 ++ patches;
pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx84.patchnew file+25
@@ -0,0 +1,25 @@
1+diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
2+index 10ac77b..0125d9b 100644
3+--- a/docshell/base/nsAboutRedirector.cpp
4++++ b/docshell/base/nsAboutRedirector.cpp
5+@@ -63,8 +63,6 @@ static const RedirEntry kRedirMap[] = {
6+ {"about", "chrome://global/content/aboutAbout.html", 0},
7+ {"addons", "chrome://mozapps/content/extensions/extensions.xhtml",
8+ nsIAboutModule::ALLOW_SCRIPT},
9+- {"buildconfig", "chrome://global/content/buildconfig.html",
10+- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT},
11+ {"checkerboard", "chrome://global/content/aboutCheckerboard.html",
12+ nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
13+ nsIAboutModule::ALLOW_SCRIPT},
14+diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
15+index c83b3e2..d543140 100644
16+--- a/toolkit/content/jar.mn
17++++ b/toolkit/content/jar.mn
18+@@ -40,7 +40,6 @@ toolkit.jar:
19+ content/global/plugins.css
20+ content/global/plugins.js
21+ content/global/browser-child.js
22+-* content/global/buildconfig.html
23+ content/global/buildconfig.css
24+ content/global/contentAreaUtils.js
25+ content/global/datepicker.xhtml
pkgs/applications/networking/browsers/firefox/packages.nix+2−13
@@ -7,23 +7,12 @@ in
77rec {
88 firefox = common rec {
99 pname = "firefox";
10− ffversion = "83.0";
10+ ffversion = "84.0";
1111 src = fetchurl {
1212 url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
13− sha512 = "3va5a9471677jfzkhqp8xkba45n0bcpphbabhqbcbnps6p85m3y98pl5jy9q7cpq3a6gxc4ax7bp90yz2nfvfq7i64iz397xpprri2a";
13+ sha512 = "37d5hc2wv1b6il4flgsw5g7ihw2jx3qrrmgm4cjg3lmk91q8k7908sy79z24na6529y7jxpj4m05l6yb850wnnwjhyc4c3vxqbldnba";
1414 };
1515
16− patches = [
17− # Fix compilation on aarch64 with newer rust version
18− # See https://bugzilla.mozilla.org/show_bug.cgi?id=1677690
19− # and https://bugzilla.redhat.com/show_bug.cgi?id=1897675
20− (fetchpatch {
21− name = "aarch64-simd-bgz-1677690.patch";
22− url = "https://github.com/mozilla/gecko-dev/commit/71597faac0fde4f608a60dd610d0cefac4972cc3.patch";
23− sha256 = "1f61nsgbv2c2ylgjs7wdahxrrlgc19gjy5nzs870zr1g832ybwin";
24− })
25− ];
26−
2716 meta = {
2817 description = "A web browser built from Firefox source tree";
2918 homepage = "http://www.mozilla.com/en-US/firefox/";