Skip to content

[21.11] firefox, firefox-bin: 96.0.3 -> 97.0; firefox-esr: 91.5.1esr -> 91.6.0esr#158663

Merged
vcunat merged 6 commits intoNixOS:release-21.11from
mweinelt:21.11/firefox
Feb 12, 2022
Merged

[21.11] firefox, firefox-bin: 96.0.3 -> 97.0; firefox-esr: 91.5.1esr -> 91.6.0esr#158663
vcunat merged 6 commits intoNixOS:release-21.11from
mweinelt:21.11/firefox

Conversation

@mweinelt
Copy link
Copy Markdown
Member

@mweinelt mweinelt commented Feb 8, 2022

Motivation for this change

Backport #158491

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@mweinelt mweinelt added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Feb 8, 2022
@mweinelt mweinelt requested a review from jonringer as a code owner February 8, 2022 17:44
@mweinelt mweinelt requested review from ajs124 and vcunat February 8, 2022 17:48
@ofborg ofborg bot requested review from edolstra, lovesegfault and nbp February 8, 2022 18:18
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Feb 8, 2022
@ajs124
Copy link
Copy Markdown
Member

ajs124 commented Feb 8, 2022

ERROR: Rust compiler 1.56.1 is too old.

@jonringer
Copy link
Copy Markdown
Contributor

jonringer commented Feb 8, 2022

rip

@jonringer
Copy link
Copy Markdown
Contributor

jonringer commented Feb 8, 2022

backporting rustc shouldn't cause any regressions. I'd be open to backporting the rustc bump, then adding this to staging-21.11

@jonringer
Copy link
Copy Markdown
Contributor

jonringer commented Feb 8, 2022 •
edited
Loading

If someone with hydra admin access was available, we could probably add it to staging-next-21.11, force an eval, then cancel all non-current builds on that job

Most of staging-next-21.11 is still queued

@ajs124
Copy link
Copy Markdown
Member

ajs124 commented Feb 8, 2022

I think historically, we've just went with _latest attributes, instead of backporting the default.

alyssais and others added 4 commits February 8, 2022 20:30
@alyssais @mweinelt
rustc_1_57: init at 1.57.0
d41e24a 
(cherry picked from commit f56f3f7)
@mweinelt
firefox: 96.0.3 -> 97.0
6c4ce75 
(cherry picked from commit a41acde)
@mweinelt
firefox-esr-91: 91.5.1esr -> 91.6.0esr
95fab68 
(cherry picked from commit 38219f7)
@mweinelt
firefox-bin: 96.0.3 -> 97.0
bb26eae 
(cherry picked from commit f448fc7)
@mweinelt mweinelt requested review from LnL7, Mic92 and zowoq as code owners February 8, 2022 19:43
@github-actions github-actions bot added the 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. label Feb 8, 2022
@mweinelt
Copy link
Copy Markdown
Member Author

mweinelt commented Feb 8, 2022

Added a backport for rustc_1_57, local build is running but I'm currently still building rustc.

@mweinelt
Copy link
Copy Markdown
Member Author

mweinelt commented Feb 8, 2022

0:23.96(B ERROR: Requested 'nss >= 3.74' but version of NSS is 3.73.0(B(B

👏

@jonringer
Copy link
Copy Markdown
Contributor

jonringer commented Feb 8, 2022

oof

@vcunat
Copy link
Copy Markdown
Member

vcunat commented Feb 8, 2022

Oh, I'm actually surprised that 21.11 did hold out so long without adding these _latest versions for firefox.

@vcunat
Copy link
Copy Markdown
Member

vcunat commented Feb 9, 2022 •
edited
Loading

Please don't merge before:

  • ensuring that thunderbird builds

@vcunat
thunderbird: 91.5.1 -> 91.6.0
585b60b 
This also fixes build after firefox-esr update (commit 95fab68)
https://www.thunderbird.net/en-US/thunderbird/91.6.0/releasenotes/

(cherry picked from commit ca54a64)
@vcunat
Copy link
Copy Markdown
Member

vcunat commented Feb 9, 2022 •
edited
Loading

I'm not sure what we should do with nss versions on 21.11. Right now we have 3.73.0, and I have no idea how to check if some non-current version has security issues (or other significant issues). For ESR Mozilla maintains 3.68.x, but we're past that, so I'm not sure if downgrading the global default is a good idea.

@ajs124
Copy link
Copy Markdown
Member

ajs124 commented Feb 9, 2022

nss changelogs are here now.

I'd say backporting recent nss releases as the default is probably fine, but we aren't missing any crucial bugfixes if we don't AFAICT.

I did that in #158686, but that doesn't really help us for this situation we're stuck in with firefox right now. Except if we want to go directly to release-21.11 with it (or just merge it into this PR).

@vcunat
Revert "firefox: 96.0.3 -> 97.0"
f17a7ee 
This reverts commit 6c4ce75.
It needs updated nss; let's do this later (e.g. staging-next-21.11).
vcunat added a commit that referenced this pull request Feb 12, 2022
@vcunat
Merge #158663: firefox + thunderbird updates
2a91047 
...into release-21.11
But the main update of `firefox` attribute to 97 was not included yet.
@vcunat vcunat merged commit a059230 into NixOS:release-21.11 Feb 12, 2022
vcunat added a commit that referenced this pull request Feb 12, 2022
@vcunat
Re-revert "firefox: 96.0.3 -> 97.0"
55ce616 
This reverts commit f17a7ee.
/cc the original PR #158663.
@vcunat
Copy link
Copy Markdown
Member

vcunat commented Feb 12, 2022

As noone seemed eager to do a workaround that would probably be useful only for a few days, I deferred the part depending on nss bump to the staging-next-21.11 branch.

All combinations pushed to both branches build for me (on x86_64-linux), and I also did some brief testing.

@ofborg ofborg bot added 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. and removed 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Feb 12, 2022
@mweinelt mweinelt deleted the 21.11/firefox branch February 12, 2022 11:17
yayayayaka pushed a commit to yayayayaka/nixpkgs that referenced this pull request May 1, 2022
@vcunat @yayayayaka
Re-revert "firefox: 96.0.3 -> 97.0"
c9a88c3 
This reverts commit f17a7ee.
/cc the original PR NixOS#158663.
jsoo1 pushed a commit to awakesecurity/nixpkgs that referenced this pull request Jul 12, 2023
@vcunat @jsoo1
Re-revert "firefox: 96.0.3 -> 97.0"
59b0ba4 
This reverts commit f17a7ee.
/cc the original PR NixOS#158663.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jonringer jonringer Awaiting requested review from jonringer

@vcunat vcunat Awaiting requested review from vcunat

@ajs124 ajs124 Awaiting requested review from ajs124

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@nbp nbp Awaiting requested review from nbp

@edolstra edolstra Awaiting requested review from edolstra

@LnL7 LnL7 Awaiting requested review from LnL7

@Mic92 Mic92 Awaiting requested review from Mic92 Mic92 is a code owner

@zowoq zowoq Awaiting requested review from zowoq zowoq is a code owner

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mweinelt @ajs124 @jonringer @vcunat @alyssais