git.iko.soy/typeable/nixpkgs
on master help sign in
Merge #89438: firefox updates (into staging-next)

Most of the changes are in already, but we referenced these commit hashes from 20.03, so let's include them in the history.

commit6857bccf12e1b55b75e22342368feef22c78d7b9 authorVladimír Čunát <v@cunat.cz> dateSun 14 Jun 2020, 11:40 (6 years ago) parente1b93800e3b3bd
2 files changed+2−8
pkgs/applications/networking/browsers/firefox/common.nix−6 pkgs/applications/networking/browsers/firefox/packages.nix+2−2
pkgs/applications/networking/browsers/firefox/common.nix−6
@@ -94,11 +94,6 @@ stdenv.mkDerivation ({
9494
9595 patches = [
9696 ./env_var_for_system_dir.patch
97− # Fix for NSS 3.52 (add missing CK_GCM_PARMS field)
98− (fetchpatch {
99− url = "https://hg.mozilla.org/mozilla-central/raw-rev/463069687b3d";
100− sha256 = "00yhz67flnkww3rbry0kqn6z6bm7vxfb2sgf7qikgbjcm3ysvpsm";
101− })
10297 ]
10398 ++ patches;
10499
@@ -143,7 +138,6 @@ stdenv.mkDerivation ({
143138 "-Wno-error=format-security");
144139
145140 postPatch = ''
146− substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h'
147141 rm -rf obj-x86_64-pc-linux-gnu
148142 '';
149143
pkgs/applications/networking/browsers/firefox/packages.nix+2−2
@@ -7,10 +7,10 @@ in
77rec {
88 firefox = common rec {
99 pname = "firefox";
10− ffversion = "76.0.1";
10+ ffversion = "77.0.1";
1111 src = fetchurl {
1212 url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
13− sha512 = "0gnhfcgrz6022xf3vqia3s3639xa5pjp13h343d3c09mn8r919cmm6s38vzj1v3734fm25zb68acyarsp72xqq8z1420rh02b2pv38q";
13+ sha512 = "ngLihC0YuclLJEV3iPEX+tRzDKIdBe+CCOuFxvWNo7DnX8royOvTj2m4YyWyZoTQ5UCbPTQYmP4otgfovZSe8g==";
1414 };
1515
1616 patches = [