Skip to content

[22.05] firefox-unwrapped: 104.0.2 -> 105.0; firefox-esr-102-unwrapped: 102.2.0esr -> 102.3.0esr #192093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mweinelt merged 3 commits into from
Sep 21, 2022
Merged

[22.05] firefox-unwrapped: 104.0.2 -> 105.0; firefox-esr-102-unwrapped: 102.2.0esr -> 102.3.0esr #192093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d17d1b
firefox-unwrapped: 104.0.2 -> 105.0
mweinelt Sep 19, 2022
1c265e1
firefox-esr-102-unwrapped: 102.2.0esr -> 102.3.0esr
mweinelt Sep 19, 2022
7c48aa5
buildMozillaMach: use rust 1.61
mweinelt Sep 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/applications/networking/browsers/firefox/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@

# build time
, autoconf
, cargo
, dump_syms
, makeWrapper
, nodejs
Expand All @@ -34,9 +33,8 @@
, pkgsCross # wasm32 rlbox
, python3
, runCommand
, rustc
, rustPackages_1_61
, rust-cbindgen
, rustPlatform
, unzip
, which
, wrapGAppsHook
Expand Down Expand Up @@ -143,6 +141,8 @@ assert pipewireSupport -> !waylandSupport || !webrtcSupport -> throw "${pname}:
let
flag = tf: x: [(if tf then "--enable-${x}" else "--disable-${x}")];

inherit (rustPackages_1_61) cargo rustc rustPlatform;

# Target the LLVM version that rustc is built with for LTO.
llvmPackages0 = rustc.llvmPackages;
llvmPackagesBuildBuild0 = pkgsBuildBuild.rustc.llvmPackages;
Expand Down
8 changes: 4 additions & 4 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
rec {
firefox = buildMozillaMach rec {
pname = "firefox";
version = "104.0.2";
version = "105.0";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "bf0d972add11566f5ef6402a22abd82122945de9fa9aab6ed7bb7e41d0843d41948a6d95c0769b0b704c066c8ff6e3f3bf26fcf288c64cd3b3f09a13d4dd467d";
sha512 = "a48f323f874b538402630a9094daa83189b3ca319feddc80fd66d087eca13f21c8b2d85be9c29e948c18cb7c524adac44e135adcde4d4592738e104ae9c1a734";
};

meta = {
Expand All @@ -28,11 +28,11 @@ rec {

firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr";
version = "102.2.0esr";
version = "102.3.0esr";
applicationName = "Mozilla Firefox ESR";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "06d753867ccfe1b2c79148cc60bc816b47a2abfa98219808868e9028bef1763d982ef7012698d06b8959cce79163d7926baf5f9d5ca9daa18c51fbf0efc59993";
sha512 = "35357791f4de8b474780083a22fb52b7846b8012cbf01403f2b9526151d11c196ce0f9fba8e0f16d8235d7259af6fba1bc3acbb5b7e79129a28f390467aa7556";
};

meta = {
Expand Down