diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-06-14 11:40:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-06-14 11:41:42 +0200 |
| commit | 6857bccf12e1b55b75e22342368feef22c78d7b9 (patch) | |
| tree | f10014f93838cb6b9676792edc78e2c69209e215 /pkgs/applications/networking/browsers | |
| parent | e1b93806ba17694f8891577b98e09eab92cd026d (diff) | |
| parent | 0e3b3bd5b08472f5c1ad60dff5439fdd95d4ff87 (diff) | |
| download | nixlib-6857bccf12e1b55b75e22342368feef22c78d7b9.tar nixlib-6857bccf12e1b55b75e22342368feef22c78d7b9.tar.gz nixlib-6857bccf12e1b55b75e22342368feef22c78d7b9.tar.bz2 nixlib-6857bccf12e1b55b75e22342368feef22c78d7b9.tar.lz nixlib-6857bccf12e1b55b75e22342368feef22c78d7b9.tar.xz nixlib-6857bccf12e1b55b75e22342368feef22c78d7b9.tar.zst nixlib-6857bccf12e1b55b75e22342368feef22c78d7b9.zip | |
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.
Diffstat (limited to 'pkgs/applications/networking/browsers')
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/common.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/firefox/packages.nix | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 817d17e8fad0..8060895a2e0f 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -94,11 +94,6 @@ stdenv.mkDerivation ({ patches = [ ./env_var_for_system_dir.patch - # Fix for NSS 3.52 (add missing CK_GCM_PARMS field) - (fetchpatch { - url = "https://hg.mozilla.org/mozilla-central/raw-rev/463069687b3d"; - sha256 = "00yhz67flnkww3rbry0kqn6z6bm7vxfb2sgf7qikgbjcm3ysvpsm"; - }) ] ++ patches; @@ -143,7 +138,6 @@ stdenv.mkDerivation ({ "-Wno-error=format-security"); postPatch = '' - substituteInPlace third_party/prio/prio/rand.c --replace 'nspr/prinit.h' 'prinit.h' rm -rf obj-x86_64-pc-linux-gnu ''; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 753791be07c5..f0ca1c7cd154 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "76.0.1"; + ffversion = "77.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0gnhfcgrz6022xf3vqia3s3639xa5pjp13h343d3c09mn8r919cmm6s38vzj1v3734fm25zb68acyarsp72xqq8z1420rh02b2pv38q"; + sha512 = "ngLihC0YuclLJEV3iPEX+tRzDKIdBe+CCOuFxvWNo7DnX8royOvTj2m4YyWyZoTQ5UCbPTQYmP4otgfovZSe8g=="; }; patches = [ |