diff options
| author | Andreas Rammhold <andreas@rammhold.de> | 2020-10-20 15:56:14 +0200 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:29:06 +0000 |
| commit | adedbc2e22804782bbbd1ba51b4b904b4bd2df45 (patch) | |
| tree | 90ff8aa21ff8f83cdf1b4b64f3e0cb99a7749492 /nixpkgs/pkgs | |
| parent | 17eb42427866ebb422e654ec7432f23b60a3ce86 (diff) | |
| download | nixlib-adedbc2e22804782bbbd1ba51b4b904b4bd2df45.tar nixlib-adedbc2e22804782bbbd1ba51b4b904b4bd2df45.tar.gz nixlib-adedbc2e22804782bbbd1ba51b4b904b4bd2df45.tar.bz2 nixlib-adedbc2e22804782bbbd1ba51b4b904b4bd2df45.tar.lz nixlib-adedbc2e22804782bbbd1ba51b4b904b4bd2df45.tar.xz nixlib-adedbc2e22804782bbbd1ba51b4b904b4bd2df45.tar.zst nixlib-adedbc2e22804782bbbd1ba51b4b904b4bd2df45.zip | |
firefox: 81.0.2 -> 82.0
(cherry picked from commit ae2f5cccbb726ad864586b662b5656f73393a3a3)
Diffstat (limited to 'nixpkgs/pkgs')
3 files changed, 7 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 7e0fbeedcca8..ef765ca4ee34 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -11,6 +11,7 @@ , icu67, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc , rust-cbindgen, nodejs, nasm, fetchpatch +, gnum4 , debugBuild ? false ### optionals @@ -148,6 +149,7 @@ buildStdenv.mkDerivation ({ ++ lib.optional ltoSupport llvmPackages.libunwind ++ lib.optionals waylandSupport [ libxkbcommon ] ++ lib.optionals pipewireSupport [ pipewire ] + ++ lib.optionals (lib.versionAtLeast ffversion "82") [ gnum4 ] ++ lib.optionals buildStdenv.isDarwin [ CoreMedia ExceptionHandling Kerberos AVFoundation MediaToolbox CoreLocation Foundation libobjc AddressBook cups ]; diff --git a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix index 22d10cc895d9..cc1aa3163b1a 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/firefox/packages.nix @@ -3,10 +3,10 @@ rec { firefox = firefoxCommon rec { pname = "firefox"; - ffversion = "81.0.2"; + ffversion = "82.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "1szsj7rwpn7ggiavvnc38a75ip0r3p5bgr2kvy2hq7519abzmr3z49jg4alpsy1ndkfylvh28zjw9h5xys0bvs40f33ps90j60z8gla"; + sha512 = "3lbvlb6yggd5v0pkr0x6j350jc5dpclqz7bv4i06r97a5ijdgfc7c6y605966hvw24v17byxr120xc7a39ikl1wnls7a9gyzyqcwyw8"; }; patches = [ diff --git a/nixpkgs/pkgs/top-level/all-packages.nix b/nixpkgs/pkgs/top-level/all-packages.nix index f0f6950a1355..3a6a521e286d 100644 --- a/nixpkgs/pkgs/top-level/all-packages.nix +++ b/nixpkgs/pkgs/top-level/all-packages.nix @@ -19779,7 +19779,6 @@ in filezilla = callPackage ../applications/networking/ftp/filezilla { }; firefoxCommon = args: callPackage (import ../applications/networking/browsers/firefox/common.nix args) { - inherit (rustPackages_1_46) cargo rustc; libpng = libpng_apng; gnused = gnused_422; inherit (darwin.apple_sdk.frameworks) CoreMedia ExceptionHandling @@ -19791,7 +19790,9 @@ in firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix { }); firefox-unwrapped = firefoxPackages.firefox; - firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78; + firefox-esr-78-unwrapped = firefoxPackages.firefox-esr-78.override { + inherit (rustPackages_1_46) cargo rustc; + }; firefox-esr-unwrapped = firefox-esr-78-unwrapped; firefox-beta-unwrapped = firefoxPackages.firefox-beta; firefox = wrapFirefox firefox-unwrapped { }; |