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

firefox, firefox-bin: 59.0.2 -> 59.0.3, firefox-esr: 2.7.3esr -> 52.7.4esr #40006

Merged
merged 9 commits into from May 12, 2018

Conversation

taku0
Copy link
Contributor

@taku0 taku0 commented May 5, 2018

Motivation for this change
  • Just bumping version (fix for compatibility with Windows 10 April 2018 update)

https://www.mozilla.org/en-US/firefox/59.0.3/releasenotes/
https://www.mozilla.org/en-US/firefox/52.7.4/releasenotes/

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Tested only firefox-bin.


@vcunat
Copy link
Member

vcunat commented May 5, 2018

For firefox the source downloads very slowly and it doesn't arrive at the same hash. Any idea why? ESR source seems OK, but the other one seems it might be a generated snapshot or something...

EDIT: my download is getting hash 2dh2hp307iz90969i8r96hdmd0d2v2d5zjp0n3klsn789sd6b3jdznb4mc5ghpm2rpcl48rqakw6apvmhidcahc1zbc1fq6j6a86jqp

@andir
Copy link
Member

andir commented May 5, 2018

Same issue for me. The downloads have always been slow but not as slow as this time.

The build fails with the same hash as for @vcunat 2dh2hp307iz90969i8r96hdmd0d2v2d5zjp0n3klsn789sd6b3jdznb4mc5ghpm2rpcl48rqakw6apvmhidcahc1zbc1fq6j6a86jqp.

According to http://releases.mozilla.org/pub/firefox/releases/59.0.3/SOURCE the commit hash we are using is correct for that specific tag (is that the right term with hg?). Also https://hg.mozilla.org/releases/mozilla-release/rev/FIREFOX_59_0_3_RELEASE points to the same.

@taku0
Copy link
Contributor Author

taku0 commented May 6, 2018

Updated hash. I have no idea why the hash changed. The URL point to the FIREFOX_59_0_3_RELEASE tag and it should not change.

https://hg.mozilla.org/releases/mozilla-release/file/6b51784853e4

@vcunat
Copy link
Member

vcunat commented May 6, 2018

Looking at download links at https://hg.mozilla.org/releases/mozilla-release/rev/FIREFOX_59_0_3_RELEASE , I thought the tarball is a dynamically generated one and thought we would better switch to fetchzip to avoid hash changes. But I tried to re-fetch the 59.0 tarball, and the hash matched as we had it in nixpkgs, so maybe it was just some kind of "random" failure...

@taku0
Copy link
Contributor Author

taku0 commented May 8, 2018

Updated to use fetchzip.

@andir
Copy link
Member

andir commented May 10, 2018

Would you mind updating this for Firefox 60 which got released? I'll try to verify it again. Rebuilding the current state right now

@taku0
Copy link
Contributor Author

taku0 commented May 10, 2018

OK, now updating. The archive server has source archive again, but SHA512SUMS have no hash for the source archive. I'm updating the nix expression manually.

@taku0
Copy link
Contributor Author

taku0 commented May 11, 2018

Updated to 60.0.

We have two ESR versions 52.8.0 and 60.0 for smooth migration.
https://www.mozilla.org/en-US/firefox/organizations/

@andir
Copy link
Member

andir commented May 11, 2018

Thanks!

What are your thoughts on the migration to version 60 as the default ESR version? IMHO on master we could do that right away but when backporting to relases (18.03…) we would keep the older ESR?

@andir
Copy link
Member

andir commented May 11, 2018

Also what is the current best practice in regards to target branch for this? Should this go into staging instead since we've a large number of rebuilds (caused by nspr & nss)? (cc @vcunat)

@taku0
Copy link
Contributor Author

taku0 commented May 12, 2018

@andir IMO, stable branches should keep 52.x as long as it is supported. The master can be 60.x because when the next NixOS 18.09 is released, 52.x is no longer supported.

@andir andir mentioned this pull request May 12, 2018
8 tasks
@andir
Copy link
Member

andir commented May 12, 2018

@taku0 looks good to me. Can you change the target branch to staging?

I've prepared a backport to 18.03 @ #40396.

@taku0 taku0 changed the base branch from master to staging May 12, 2018 08:19
@taku0
Copy link
Contributor Author

taku0 commented May 12, 2018

Changed the base branch.

@andir
Copy link
Member

andir commented May 12, 2018

@taku0 you probably have to pick bcb1f17 since the aarch64 build is failing (on stable) with the newer nss.

Let us see what OfBorg says about it…

@GrahamcOfBorg build nss

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nss

Partial log (click to expand)

these paths will be fetched (3.08 MiB download, 11.47 MiB unpacked):
  /nix/store/9kmcfncsv6bl3cb161g2smwgwa1003pk-nss-3.36.1
  /nix/store/na74dbjsmani7v41r6jj0m04n5nfcfc3-nspr-4.19
  /nix/store/r6lpv1awkhjxpjbkl2gv2whzp9ydw302-gcc-7.3.0-lib
  /nix/store/y814z576i5za17a76r49m6vq7z0xkn8b-sqlite-3.22.0
copying path '/nix/store/r6lpv1awkhjxpjbkl2gv2whzp9ydw302-gcc-7.3.0-lib' from 'https://cache.nixos.org'...
copying path '/nix/store/na74dbjsmani7v41r6jj0m04n5nfcfc3-nspr-4.19' from 'https://cache.nixos.org'...
copying path '/nix/store/y814z576i5za17a76r49m6vq7z0xkn8b-sqlite-3.22.0' from 'https://cache.nixos.org'...
copying path '/nix/store/9kmcfncsv6bl3cb161g2smwgwa1003pk-nss-3.36.1' from 'https://cache.nixos.org'...
/nix/store/9kmcfncsv6bl3cb161g2smwgwa1003pk-nss-3.36.1

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: nss

Partial log (click to expand)

cannot build derivation '/nix/store/95v4pg2hfrbskb3jf3krpgikfjv6cgnr-apple-framework-NetFS.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/31zqh6hrchxqd32md2k6akxs41asn9wf-apple-framework-OpenDirectory.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/jnp3zyprgkmfb7iwdf6k2wa4syiqbg4g-apple-framework-CoreAudio.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/8h5wr1lcz6vrbm5jg81yd6mza9q8bj8q-apple-framework-DiskArbitration.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/nnbz3wivjk6z1dm2dx5y8z61ijpm7v9b-apple-framework-Security.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/35cn8lczfs8r7gsby7na1cilfa09yny2-apple-framework-ServiceManagement.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/phaw46bfmfxi5wxricsxcc8j5x92fm8c-apple-framework-CoreServices.drv': 12 dependencies couldn't be built
cannot build derivation '/nix/store/shvk6mmk1n24q0rp45kiw2mhyyb4rysk-nspr-4.19.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/j4a71jn6fmzn41h8scjh5n78b43p8ww3-nss-3.36.1.drv': 7 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/j4a71jn6fmzn41h8scjh5n78b43p8ww3-nss-3.36.1.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: nss

Partial log (click to expand)

cannot build derivation '/nix/store/95v4pg2hfrbskb3jf3krpgikfjv6cgnr-apple-framework-NetFS.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/31zqh6hrchxqd32md2k6akxs41asn9wf-apple-framework-OpenDirectory.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/jnp3zyprgkmfb7iwdf6k2wa4syiqbg4g-apple-framework-CoreAudio.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/8h5wr1lcz6vrbm5jg81yd6mza9q8bj8q-apple-framework-DiskArbitration.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/nnbz3wivjk6z1dm2dx5y8z61ijpm7v9b-apple-framework-Security.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/35cn8lczfs8r7gsby7na1cilfa09yny2-apple-framework-ServiceManagement.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/phaw46bfmfxi5wxricsxcc8j5x92fm8c-apple-framework-CoreServices.drv': 12 dependencies couldn't be built
cannot build derivation '/nix/store/shvk6mmk1n24q0rp45kiw2mhyyb4rysk-nspr-4.19.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/j4a71jn6fmzn41h8scjh5n78b43p8ww3-nss-3.36.1.drv': 7 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/j4a71jn6fmzn41h8scjh5n78b43p8ww3-nss-3.36.1.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nss

Partial log (click to expand)

these paths will be fetched (1.38 MiB download, 5.02 MiB unpacked):
  /nix/store/9kmcfncsv6bl3cb161g2smwgwa1003pk-nss-3.36.1
  /nix/store/na74dbjsmani7v41r6jj0m04n5nfcfc3-nspr-4.19
copying path '/nix/store/na74dbjsmani7v41r6jj0m04n5nfcfc3-nspr-4.19' from 'https://cache.nixos.org'...
copying path '/nix/store/9kmcfncsv6bl3cb161g2smwgwa1003pk-nss-3.36.1' from 'https://cache.nixos.org'...
/nix/store/9kmcfncsv6bl3cb161g2smwgwa1003pk-nss-3.36.1

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: nss

Partial log (click to expand)

patching file nss/lib/ckfw/pem/psession.c
patching file nss/lib/ckfw/pem/pslot.c
patching file nss/lib/ckfw/pem/ptoken.c
patching file nss/lib/ckfw/pem/rsawrapr.c
patching file nss/lib/ckfw/pem/util.c
patching file lib/freebl/Makefile
Hunk #1 FAILED at 522.
1 out of 1 hunk FAILED -- saving rejects to file lib/freebl/Makefile.rej
builder for '/nix/store/c874ky3pm7ymyb4v7wc7n6708jkan2mv-nss-3.36.1.drv' failed with exit code 1
�[31;1merror:�[0m build of '/nix/store/c874ky3pm7ymyb4v7wc7n6708jkan2mv-nss-3.36.1.drv' failed

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: nss

Partial log (click to expand)

patching file nss/lib/ckfw/pem/psession.c
patching file nss/lib/ckfw/pem/pslot.c
patching file nss/lib/ckfw/pem/ptoken.c
patching file nss/lib/ckfw/pem/rsawrapr.c
patching file nss/lib/ckfw/pem/util.c
patching file lib/freebl/Makefile
Hunk #1 FAILED at 522.
1 out of 1 hunk FAILED -- saving rejects to file lib/freebl/Makefile.rej
builder for '/nix/store/c874ky3pm7ymyb4v7wc7n6708jkan2mv-nss-3.36.1.drv' failed with exit code 1
�[31;1merror:�[0m build of '/nix/store/c874ky3pm7ymyb4v7wc7n6708jkan2mv-nss-3.36.1.drv' failed

With the update to 3.36 the patch introduced with e96473b is no longer
required.
@taku0
Copy link
Contributor Author

taku0 commented May 12, 2018

Rebased onto staging branch and cheery-picked nss: removed aarch64 patch. The branch already has nspr-4.19 and nss-3.36.1.

@vcunat
Copy link
Member

vcunat commented May 12, 2018

aarch64-linux is probably OK now, but let me finish pre-testing the builds on aarch64.nixos.community (the Borg's machine).

@andir
Copy link
Member

andir commented May 12, 2018

@GrahamcOfBorg build nss

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: nss

Partial log (click to expand)

/nix/store/cqdr1xhvdq1jxjjfis37jvis4fqfl3s6-nss-3.36.1

@andir andir merged commit 6ec7291 into NixOS:staging May 12, 2018
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nss

Partial log (click to expand)

/nix/store/9kmcfncsv6bl3cb161g2smwgwa1003pk-nss-3.36.1

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: nss

Partial log (click to expand)

cannot build derivation '/nix/store/jagbxb72m22vy9fhrhngycii2yjy56hi-apple-framework-NetFS.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/zaaj63j0lhfhfnzqy1w7bjs2z7l815x2-apple-framework-OpenDirectory.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/cy5xx2s0flif03rs5f25kxvp9ihmrh0i-apple-framework-CoreAudio.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/qpxsdk04iaq2dc6slfl1lank6x8z8mi2-apple-framework-DiskArbitration.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/zw7hp9xj62ghhxpx07m2941nvps11g0n-apple-framework-Security.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/yhi3zqr5iafb8kh673iir472lizd9i9v-apple-framework-ServiceManagement.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/qjmjz0l850zgsn6k1pkinvc5z1pnk76a-apple-framework-CoreServices.drv': 11 dependencies couldn't be built
cannot build derivation '/nix/store/p17l9qsvknfrwmbri387qp9qmscam78m-nspr-4.19.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/5nqzlyq49nl8l7ppcdsm6rdc4p2i4c9k-nss-3.36.1.drv': 5 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/5nqzlyq49nl8l7ppcdsm6rdc4p2i4c9k-nss-3.36.1.drv' failed

@vcunat
Copy link
Member

vcunat commented May 12, 2018

I only now got to building firefox itself, after many packages like llvm and rustc. We'll fix it up later in the worst case; there are far bigger breakages on staging ATM anyway.

@danbst
Copy link
Contributor

danbst commented Aug 2, 2018

Guys, I'm disappointed about removal of firefox-esr-unwrapped top-level attribute. Not that it is bad, but that somehow jumped into 18.03 branch and broke stable API assumptions.

@vcunat
Copy link
Member

vcunat commented Aug 2, 2018

Right, I brought it back on 18.03.

ATM I'm not even certain it was intentional to remove it on master either, but intuitively if one wants ESR, one probably wants to switch the major version by hand (and thus avoid the default-esr names).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants