Skip to content
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.

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

Jump to bottom

Firefox bin 69.0.1 #69099

Merged
merged 2 commits into from Sep 21, 2019
Merged

Firefox bin 69.0.1 #69099

merged 2 commits into from Sep 21, 2019

Conversation

taku0
Copy link
Contributor

@taku0 taku0 commented Sep 19, 2019

Motivation for this change
  • Moderate security fix
  • Other bug fixes

https://www.mozilla.org/en-US/firefox/69.0.1/releasenotes/
https://www.mozilla.org/en-US/security/advisories/mfsa2019-31/

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Only tested firefox-bin. firefox is being built.

Notify maintainers

cc @edolstra @andir

@ofborg ofborg bot requested review from andir and edolstra September 19, 2019 13:29
jonringer
jonringer reviewed Sep 20, 2019
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I seem to get a regression, these build on master:

builder for '/nix/store/lcyyfnzyna7xgi341pj7pamw5z6m952p-firefox-unwrapped-69.0.1.drv' failed with exit code 2; last 10 log lines:
                   from /build/firefox-69.0.1/obj-x86_64-pc-linux-gnu/dom/bindings/HeapSnapshotBinding.cpp:8,
                   from /build/firefox-69.0.1/obj-x86_64-pc-linux-gnu/dom/bindings/UnifiedBindings9.cpp:2:
  /nix/store/pcs8pq4a5rkym1hzibqz7da45fxkmig7-gcc-8.3.0/include/c++/8.3.0/bits/stl_map.h:100:11: note: 'class std::map<long unsigned int, mozilla::layers::ScrollUpdateInfo>' declared here
       class map
             ^~~
  make[3]: Leaving directory '/build/firefox-69.0.1/obj-x86_64-pc-linux-gnu/dom/bindings'
  make[2]: Leaving directory '/build/firefox-69.0.1/obj-x86_64-pc-linux-gnu'
  make[1]: *** [/build/firefox-69.0.1/config/recurse.mk:34: compile] Error 2
  make[1]: Leaving directory '/build/firefox-69.0.1/obj-x86_64-pc-linux-gnu'
  make: *** [/build/firefox-69.0.1/config/rules.mk:391: default] Error 2
cannot build derivation '/nix/store/nmcd8q1ijb5zd20320hfj9jzdb5i27jz-adoptopenjdk-icedtea-web-1.8.3.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/y6nb8c2q9riw6cicjj3kqwrn1bip5hvs-firefox-69.0.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/nqacg53lxhdhh4drnzak7a23zilrdjws-mozplugger-2.1.6.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/qqv34zgiw15ln1fnwqqvzzbg7xz01bgd-slimerjs-1.0.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/d4jp12sp76vwrbri98nq6zqy6fc8hl39-env.drv': 4 dependencies couldn't be built
[21 built (1 failed), 12 copied (100.9 MiB), 19.1 MiB DL]
error: build of '/nix/store/d4jp12sp76vwrbri98nq6zqy6fc8hl39-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/69099
4 package failed to build:
adoptopenjdk-icedtea-web xulrunner mozplugger slimerjs

@taku0
Copy link
Contributor Author

taku0 commented Sep 21, 2019 •
edited

The packages are successfully built with this PR rebased on master (d8adf06).

$ nix-build -I nixpkgs=. --keep-failed --keep-going -A pkgs.adoptopenjdk-icedtea-web -A pkgs.xulrunner -A pkgs.mozplugger -A pkgs.slimerjs
/nix/store/ra3r99yc84k430viqxcvcz6ygbdkjfaz-adoptopenjdk-icedtea-web-1.8.3
/nix/store/k9akv5bbqnjy7plq8pja0kxp76sfz7x7-firefox-unwrapped-69.0.1
/nix/store/fpr7lj7wyqf3grww4ms5klq90c33pqyk-mozplugger-2.1.6
/nix/store/nnnzqhsm7jj7m1cdzj68igdq84limbyc-slimerjs-1.0.0

$ nix-build -I nixpkgs=. --keep-failed --keep-going -A pkgs.firefox
/nix/store/mkk0f8amxbpidrzdppx4k34mpj9msxf6-firefox-69.0.1

$ git log HEAD...HEAD^^^
commit 6d1e1c970af456a58aa5cfa57e84149ae543bf56 (HEAD -> tmp)
Author: taku0 <mxxouy6x3m_github@tatapa.org>
Date:   Thu Sep 19 21:50:43 2019 +0900

    firefox: 69.0 -> 69.0.1

commit 5013dc6484de37dfa4177c015b092c3f70750d52
Author: taku0 <mxxouy6x3m_github@tatapa.org>
Date:   Thu Sep 19 21:43:32 2019 +0900

    firefox-bin: 69.0 -> 69.0.1

commit d8adf06d355e9f49c86089c7231202094f4ede05 (upstream/master, origin/master, origin/HEAD, master)
Author: Matthew Bauer <mjbauer95@gmail.com>
Date:   Fri Mar 8 20:06:22 2019 -0500

    release.nix: remove firefox-unwrapped from darwin-tested
    
    Unfortunately it is broken and I won’t have time to fix right now.
    Most likely we will have to wait until the macOS 10.12 update to get
    this one working again.
    
    (cherry picked from commit 70f1335f8d64d1f8451b891d4fca4af08e607d09)

vcunat
vcunat approved these changes Sep 21, 2019
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both work fine for me atop master.

@Mic92 Mic92 merged commit 8fc3fe4 into NixOS:master Sep 21, 2019
@vcunat
Copy link
Member

vcunat commented Sep 21, 2019

Hmm, I verified even exact /nix/store/lcyyfnzyna7xgi341pj7pamw5z6m952p-firefox-unwrapped-69.0.1.drv builds – I hope it was just some rare glitch.

@Mic92
Copy link
Member

Mic92 commented Sep 21, 2019

Also built for me.

@Mic92
Copy link
Member

Mic92 commented Sep 21, 2019

[detached HEAD 61201f8] firefox-bin: 69.0 -> 69.0.1
Author: taku0 mxxouy6x3m_github@tatapa.org
Date: Thu Sep 19 21:43:32 2019 +0900
1 file changed, 935 insertions(+), 935 deletions(-)
rewrite pkgs/applications/networking/browsers/firefox-bin/release_sources.nix (60%)
Press Enter to continue
[detached HEAD 1bf3db5] firefox: 69.0 -> 69.0.1
Author: taku0 mxxouy6x3m_github@tatapa.org
Date: Thu Sep 19 21:50:43 2019 +0900
1 file changed, 2 insertions(+), 2 deletions(-)

@Mic92
Copy link
Member

Mic92 commented Sep 21, 2019

[detached HEAD 75fdf70] firefox-bin: 69.0 -> 69.0.1
Author: taku0 mxxouy6x3m_github@tatapa.org
Date: Thu Sep 19 21:43:32 2019 +0900
1 file changed, 935 insertions(+), 935 deletions(-)
rewrite pkgs/applications/networking/browsers/firefox-bin/release_sources.nix (60%)
Press Enter to continue
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 2080 and retry the command.
[detached HEAD d91b06e] firefox: 69.0 -> 69.0.1
Author: taku0 mxxouy6x3m_github@tatapa.org
Date: Thu Sep 19 21:50:43 2019 +0900
1 file changed, 2 insertions(+), 2 deletions(-)

dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Sep 21, 2019
@Mic92 @dtzWill
Firefox bin 69.0.1 (NixOS#69099)
7c68051 
Firefox bin 69.0.1

(cherry picked from commit 8fc3fe4)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer left review comments

@vcunat vcunat vcunat approved these changes

@andir andir Awaiting requested review from andir

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@taku0 @vcunat @Mic92 @jonringer