git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #101178 from andir/firefox-82

firefox: 81.0.2 -> 82, firefox-esr: 78.3.1esr -> 78.4.0esr

commitbd017760509492a1774b0ea2fc5c1bbb4b2d98af authorAndreas Rammhold <andreas@rammhold.de> dateTue 20 Oct 2020, 19:27 (6 years ago) parent0f3d40e6057ea4
2 files changed+6−4
pkgs/applications/networking/browsers/firefox/common.nix+2 pkgs/applications/networking/browsers/firefox/packages.nix+4−4
pkgs/applications/networking/browsers/firefox/common.nix+2
@@ -11,6 +11,7 @@
1111, icu67, libpng, jemalloc, glib
1212, autoconf213, which, gnused, cargo, rustc
1313, rust-cbindgen, nodejs, nasm, fetchpatch
14+, gnum4
1415, debugBuild ? false
1516
1617### optionals
@@ -147,6 +148,7 @@ buildStdenv.mkDerivation ({
147148 ++ lib.optional ltoSupport llvmPackages.libunwind
148149 ++ lib.optionals waylandSupport [ libxkbcommon ]
149150 ++ lib.optionals pipewireSupport [ pipewire ]
151+ ++ lib.optionals (lib.versionAtLeast ffversion "82") [ gnum4 ]
150152 ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos
151153 AVFoundation MediaToolbox CoreLocation
152154 Foundation libobjc AddressBook cups ];
pkgs/applications/networking/browsers/firefox/packages.nix+4−4
@@ -7,10 +7,10 @@ in
77rec {
88 firefox = common rec {
99 pname = "firefox";
10− ffversion = "81.0.2";
10+ ffversion = "82.0";
1111 src = fetchurl {
1212 url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
13− sha512 = "1szsj7rwpn7ggiavvnc38a75ip0r3p5bgr2kvy2hq7519abzmr3z49jg4alpsy1ndkfylvh28zjw9h5xys0bvs40f33ps90j60z8gla";
13+ sha512 = "3lbvlb6yggd5v0pkr0x6j350jc5dpclqz7bv4i06r97a5ijdgfc7c6y605966hvw24v17byxr120xc7a39ikl1wnls7a9gyzyqcwyw8";
1414 };
1515
1616 patches = [
@@ -36,10 +36,10 @@ rec {
3636
3737 firefox-esr-78 = common rec {
3838 pname = "firefox-esr";
39− ffversion = "78.3.1esr";
39+ ffversion = "78.4.0esr";
4040 src = fetchurl {
4141 url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
42− sha512 = "10a7xfp396n81aj17fbl1b1jr8gbn5ild2ig5cfz6r5ff3wfbjs3x0iqrlwqnjfdqq2pw19k2yrv91iwymd8jwjj4p35xsfivgn0a0n";
42+ sha512 = "13640ssp1nq9dsfv8jqfw2paqk3wzwc4r47mvbhb4l9h990gzzb2chhlcjq066b7r3q9s0nq3iyk847vzi7z1yvhrhsnzfgk9g9gpnr";
4343 };
4444
4545 patches = [