public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

firefox: 93.0 -> 94.0 

(cherry picked from commit 0cf88beb7b551a59947425a0b62c8f51cf7ea0e7)
This commit is contained in:
Martin Weinelt 2021-11-02 10:41:02 +01:00
parent 1652c35291
commit 95b508e695
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/browsers/firefox/common.nix
View File

@ -9,7 +9,7 @@
, hunspell, libevent, libstartup_notification , hunspell, libevent, libstartup_notification
, libvpx_1_8 , libvpx_1_8
, icu69, libpng, jemalloc, glib, pciutils , icu69, libpng, jemalloc, glib, pciutils
, autoconf213, which, gnused, rustPackages, rustPackages_1_45 , autoconf213, which, gnused, rustPackages_1_45, rustPackages_1_55
, rust-cbindgen, nodejs, nasm, fetchpatch , rust-cbindgen, nodejs, nasm, fetchpatch
, gnum4 , gnum4
, gtk2, gtk3, wrapGAppsHook , gtk2, gtk3, wrapGAppsHook
@ -99,18 +99,18 @@ let
rust-cbindgen_pkg = if lib.versionAtLeast ffversion "89" then rust-cbindgen_latest else rust-cbindgen; rust-cbindgen_pkg = if lib.versionAtLeast ffversion "89" then rust-cbindgen_latest else rust-cbindgen;
# 78 ESR won't build with rustc 1.47 # 78 ESR won't build with rustc 1.47
inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45) inherit (if lib.versionAtLeast ffversion "91" then rustPackages_1_55 else rustPackages_1_45)
rustc cargo; rustc cargo;
# Darwin's stdenv provides the default llvmPackages version, match that since # Darwin's stdenv provides the default llvmPackages version, match that since
# clang LTO on Darwin is broken so the stdenv is not being changed. # clang LTO on Darwin is broken so the stdenv is not being changed.
# Target the LLVM version that rustc -Vv reports it is built with for LTO. # Target the LLVM version that rustc -Vv reports it is built with for LTO.
# rustPackages_1_45 -> LLVM 10, rustPackages -> LLVM 11 # rustPackages_1_45 -> LLVM 10, rustPackages_1_55 -> LLVM 12
llvmPackages0 = llvmPackages0 =
/**/ if stdenv.isDarwin /**/ if stdenv.isDarwin
then buildPackages.llvmPackages then buildPackages.llvmPackages
else if lib.versionAtLeast rustc.llvm.version "11" else if lib.versionAtLeast rustc.llvm.version "12"
then buildPackages.llvmPackages_11 then buildPackages.llvmPackages_12
else buildPackages.llvmPackages_10; else buildPackages.llvmPackages_10;
# Force the use of lld and other llvm tools for LTO # Force the use of lld and other llvm tools for LTO
llvmPackages = llvmPackages0.override { llvmPackages = llvmPackages0.override {

4
pkgs/applications/networking/browsers/firefox/packages.nix
View File

@ -7,10 +7,10 @@ in
rec { rec {
firefox = common rec { firefox = common rec {
pname = "firefox"; pname = "firefox";
ffversion = "93.0"; ffversion = "94.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "b29890e331819d47201b599b9feaaa7eaa0b02088fcbf980efc4f289d43da4f73970bf35ba2f763a2a892fd5318deb68cb9a66e71e9bc0c603642434c7e32e91"; sha512 = "5eb65450a0f1842d28d73235f3ef95fa1dbf8cf1467c354f13df51313bd227aaf5a48b741ee49b13378aaaf054bff52004c1dd5a274eddef4a3cf1b913ef7071";
}; };
meta = { meta = {