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

[18.03] firefox-{esr,} 60 #40396

Merged
merged 13 commits into from May 12, 2018
Merged

[18.03] firefox-{esr,} 60 #40396

merged 13 commits into from May 12, 2018

Conversation

andir
Copy link
Member

@andir andir commented May 12, 2018

Motivation for this change

Backport of #40006

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.

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: nspr, 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/mzvc9r1dwgh07r1r61288q1q40bwvcb1-nss-3.36.1.drv' failed with exit code 1
�[31;1merror:�[0m build of '/nix/store/mzvc9r1dwgh07r1r61288q1q40bwvcb1-nss-3.36.1.drv' failed

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nspr, nss

Partial log (click to expand)

    bb e1 3f eb d5 99 66 ab fa db
    4b d5 e9 70
moduleSpec configdir='' certPrefix='' keyPrefix='' secmod='' flags=noCertDB, noModDB
Generate a DSA key pair ...
Moving /nix/store/3mbff5r06yj5kbgysr7j7fh17bwgyjxq-nss-3.36.1/bin to /nix/store/m6in1g7hvyqnzqy01c17326xmgbqciq5-nss-3.36.1-tools/bin
rmdir: failed to remove '/nix/store/3mbff5r06yj5kbgysr7j7fh17bwgyjxq-nss-3.36.1': Directory not empty
Moving /nix/store/m6in1g7hvyqnzqy01c17326xmgbqciq5-nss-3.36.1-tools/bin/nss-config to /nix/store/j3yjlkq894fby4wwf0zpjnicqx87isny-nss-3.36.1-dev/bin/nss-config
rmdir: failed to remove '/nix/store/m6in1g7hvyqnzqy01c17326xmgbqciq5-nss-3.36.1-tools/bin': Directory not empty
Moving /nix/store/3mbff5r06yj5kbgysr7j7fh17bwgyjxq-nss-3.36.1/lib/libcrmf.a to /nix/store/j3yjlkq894fby4wwf0zpjnicqx87isny-nss-3.36.1-dev/lib/libcrmf.a
rmdir: failed to remove '/nix/store/3mbff5r06yj5kbgysr7j7fh17bwgyjxq-nss-3.36.1/lib': Directory not empty

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: nspr, nss

Partial log (click to expand)

moduleSpec configdir='' certPrefix='' keyPrefix='' secmod='' flags=noCertDB, noModDB
Generate a DSA key pair ...
Moving /nix/store/4hw5zb26hwqva0f2rghbkmsan4fi9212-nss-3.36.1/bin to /nix/store/q8qrj23zkkfnhzw0apiracsshk1w7850-nss-3.36.1-tools/bin
rmdir: failed to remove '/nix/store/4hw5zb26hwqva0f2rghbkmsan4fi9212-nss-3.36.1': Directory not empty
Moving /nix/store/q8qrj23zkkfnhzw0apiracsshk1w7850-nss-3.36.1-tools/bin/nss-config to /nix/store/bng930ck241l44fabkdp7xkzyna66pjn-nss-3.36.1-dev/bin/nss-config
rmdir: failed to remove '/nix/store/q8qrj23zkkfnhzw0apiracsshk1w7850-nss-3.36.1-tools/bin': Directory not empty
Moving /nix/store/4hw5zb26hwqva0f2rghbkmsan4fi9212-nss-3.36.1/lib/libcrmf.a to /nix/store/bng930ck241l44fabkdp7xkzyna66pjn-nss-3.36.1-dev/lib/libcrmf.a
rmdir: failed to remove '/nix/store/4hw5zb26hwqva0f2rghbkmsan4fi9212-nss-3.36.1/lib': Directory not empty
/nix/store/833hms4620zqlhw5ggxza69kp98q8sal-nspr-4.19
/nix/store/4hw5zb26hwqva0f2rghbkmsan4fi9212-nss-3.36.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nspr, nss

Partial log (click to expand)

/nix/store/ryhr1ljccqcnj7qrrwdb6xdqcmg0391s-nspr-4.19
/nix/store/3mbff5r06yj5kbgysr7j7fh17bwgyjxq-nss-3.36.1

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: nspr, 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/mzvc9r1dwgh07r1r61288q1q40bwvcb1-nss-3.36.1.drv' failed with exit code 1
�[31;1merror:�[0m build of '/nix/store/mzvc9r1dwgh07r1r61288q1q40bwvcb1-nss-3.36.1.drv' failed

volth and others added 9 commits May 12, 2018 11:03
(cherry picked from commit 6450c19)
This is optional (`libcardiacarrest` has a workaround for this bug
because there's `firefox-bin` that I can't fix), but with this applied things
are a bit smoother.
(cherry picked from commit 8a16d53897cf6d6e1a8f01a9961438e821099d71)
(cherry picked from commit 632f437e5604ef33796e12dfd7fdf6c61b622f93)
(cherry picked from commit c259ecc04e77a0783b6be49c5b97bd44ab555154)
(cherry picked from commit 1a708fc0633a8d5e2477e7e5c8d3d70baf951ab2)
(cherry picked from commit 2872345b9b3e00939fea4c7ddf1b7a3d2b9ee9db)
(cherry picked from commit e96473b24982694efe9c1f2f10e01310a01750b7)
@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: nspr, nss

Partial log (click to expand)

moduleSpec configdir='' certPrefix='' keyPrefix='' secmod='' flags=noCertDB, noModDB
Generate a DSA key pair ...
Moving /nix/store/0v2wsbdjcrxvj9iqvahzsfyj9xszbkcv-nss-3.36.1/bin to /nix/store/w6rdpi2znci6z0wjb4wq61gmp686zg3h-nss-3.36.1-tools/bin
rmdir: failed to remove '/nix/store/0v2wsbdjcrxvj9iqvahzsfyj9xszbkcv-nss-3.36.1': Directory not empty
Moving /nix/store/w6rdpi2znci6z0wjb4wq61gmp686zg3h-nss-3.36.1-tools/bin/nss-config to /nix/store/k1imnpsw08wspyvh2i0mjnxn4xxnihjy-nss-3.36.1-dev/bin/nss-config
rmdir: failed to remove '/nix/store/w6rdpi2znci6z0wjb4wq61gmp686zg3h-nss-3.36.1-tools/bin': Directory not empty
Moving /nix/store/0v2wsbdjcrxvj9iqvahzsfyj9xszbkcv-nss-3.36.1/lib/libcrmf.a to /nix/store/k1imnpsw08wspyvh2i0mjnxn4xxnihjy-nss-3.36.1-dev/lib/libcrmf.a
rmdir: failed to remove '/nix/store/0v2wsbdjcrxvj9iqvahzsfyj9xszbkcv-nss-3.36.1/lib': Directory not empty
/nix/store/zmqj9x444chy98avj5sf7i4vn3mgy51b-nspr-4.19
/nix/store/0v2wsbdjcrxvj9iqvahzsfyj9xszbkcv-nss-3.36.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nspr, nss, sqlite

Partial log (click to expand)

    df 0a 33 3d 79 ac c6 12 0e 56
    e4 29 c7 d2
moduleSpec configdir='' certPrefix='' keyPrefix='' secmod='' flags=noCertDB, noModDB
Generate a DSA key pair ...
Moving /nix/store/vgplmqd3wymass20b019lvkgavis5xya-nss-3.36.1/bin to /nix/store/sqi0vgallrlwiv15dlilk7bsfd2zjlr4-nss-3.36.1-tools/bin
rmdir: failed to remove '/nix/store/vgplmqd3wymass20b019lvkgavis5xya-nss-3.36.1': Directory not empty
Moving /nix/store/sqi0vgallrlwiv15dlilk7bsfd2zjlr4-nss-3.36.1-tools/bin/nss-config to /nix/store/7bp4c3c6hhh7lqqp8zj6xjjpw002jaca-nss-3.36.1-dev/bin/nss-config
rmdir: failed to remove '/nix/store/sqi0vgallrlwiv15dlilk7bsfd2zjlr4-nss-3.36.1-tools/bin': Directory not empty
Moving /nix/store/vgplmqd3wymass20b019lvkgavis5xya-nss-3.36.1/lib/libcrmf.a to /nix/store/7bp4c3c6hhh7lqqp8zj6xjjpw002jaca-nss-3.36.1-dev/lib/libcrmf.a
rmdir: failed to remove '/nix/store/vgplmqd3wymass20b019lvkgavis5xya-nss-3.36.1/lib': Directory not empty

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: nspr, nss, sqlite

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/9cr4lvh279n0di44wcryy24rbg6bqcaq-nss-3.36.1.drv' failed with exit code 1
�[31;1merror:�[0m build of '/nix/store/9cr4lvh279n0di44wcryy24rbg6bqcaq-nss-3.36.1.drv' failed

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: nspr, nss, sqlite

Partial log (click to expand)

cannot build derivation '/nix/store/8nn6whdfxk5jslnv1z6ydvwri8hqh6zd-apple-framework-NetFS.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/nw53nah3jvbihg844zwk774bjiriqngb-apple-framework-OpenDirectory.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/ika32aq4vwjkrdnybcdjfllh6pdg9l34-apple-framework-CoreAudio.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/6khy3mjc1b3dai8ind11yw1w92zxhh5l-apple-framework-DiskArbitration.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/snq9331qq3p2xx99xs0ayjbs2h27dcpq-apple-framework-Security.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/64n1qs06xck6x98jcq7zim9mb35995dh-apple-framework-ServiceManagement.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/0bf6x63kxx7c8pr4jrx7acnc9aq166mb-apple-framework-CoreServices.drv': 12 dependencies couldn't be built
cannot build derivation '/nix/store/b39zyn18gcdbcqgmhnyqfmcnclv4a2m8-nspr-4.19.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/inm6zp52382b0h32xpqq4lancx6lmkk2-nss-3.36.1.drv': 7 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/7yv64rs195gn93kwk39drw2l0fsqcaf8-sqlite-3.22.0.drv', '/nix/store/b39zyn18gcdbcqgmhnyqfmcnclv4a2m8-nspr-4.19.drv', '/nix/store/inm6zp52382b0h32xpqq4lancx6lmkk2-nss-3.36.1.drv' failed

andir and others added 4 commits May 12, 2018 12:50
With the update to 3.36 the patch introduced with e96473b is no longer
required.
(cherry picked from commit 05a2f8f4a7be373153f95e07ee4625d77e41095b)
(cherry picked from commit 5a15da04b8101324b15a02ce1a6216ecd9a4e1dc)
(cherry picked from commit b2725027d63eb6a507a4adfbdcbabc453d7071bd)
@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: nspr, nss, sqlite

Partial log (click to expand)

/nix/store/ryhr1ljccqcnj7qrrwdb6xdqcmg0391s-nspr-4.19
/nix/store/vgplmqd3wymass20b019lvkgavis5xya-nss-3.36.1
/nix/store/0dzaiissi1ch89g74c29fr53m4kiryim-sqlite-3.22.0-bin

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: nspr, nss, sqlite

Partial log (click to expand)

Generate a DSA key pair ...
Moving /nix/store/nx0s7s7pddny8x10j628a18p8jw9ccsa-nss-3.36.1/bin to /nix/store/swrax095kcf3f9kpj40x6v76yc2c6kll-nss-3.36.1-tools/bin
rmdir: failed to remove '/nix/store/nx0s7s7pddny8x10j628a18p8jw9ccsa-nss-3.36.1': Directory not empty
Moving /nix/store/swrax095kcf3f9kpj40x6v76yc2c6kll-nss-3.36.1-tools/bin/nss-config to /nix/store/j3xdj5kpw1v9fhds12imlypb8nw86cjz-nss-3.36.1-dev/bin/nss-config
rmdir: failed to remove '/nix/store/swrax095kcf3f9kpj40x6v76yc2c6kll-nss-3.36.1-tools/bin': Directory not empty
Moving /nix/store/nx0s7s7pddny8x10j628a18p8jw9ccsa-nss-3.36.1/lib/libcrmf.a to /nix/store/j3xdj5kpw1v9fhds12imlypb8nw86cjz-nss-3.36.1-dev/lib/libcrmf.a
rmdir: failed to remove '/nix/store/nx0s7s7pddny8x10j628a18p8jw9ccsa-nss-3.36.1/lib': Directory not empty
/nix/store/lxv3zk13mvpsnq6kxq1qdckyj6p3airr-nspr-4.19
/nix/store/nx0s7s7pddny8x10j628a18p8jw9ccsa-nss-3.36.1
/nix/store/7wribi9yrwl5ngj3k9qc75a7phmbcns4-sqlite-3.22.0-bin

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Attempted: nspr, nss, sqlite

Partial log (click to expand)

cannot build derivation '/nix/store/8nn6whdfxk5jslnv1z6ydvwri8hqh6zd-apple-framework-NetFS.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/nw53nah3jvbihg844zwk774bjiriqngb-apple-framework-OpenDirectory.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/ika32aq4vwjkrdnybcdjfllh6pdg9l34-apple-framework-CoreAudio.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/6khy3mjc1b3dai8ind11yw1w92zxhh5l-apple-framework-DiskArbitration.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/snq9331qq3p2xx99xs0ayjbs2h27dcpq-apple-framework-Security.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/64n1qs06xck6x98jcq7zim9mb35995dh-apple-framework-ServiceManagement.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/0bf6x63kxx7c8pr4jrx7acnc9aq166mb-apple-framework-CoreServices.drv': 12 dependencies couldn't be built
cannot build derivation '/nix/store/b39zyn18gcdbcqgmhnyqfmcnclv4a2m8-nspr-4.19.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/inm6zp52382b0h32xpqq4lancx6lmkk2-nss-3.36.1.drv': 7 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/7yv64rs195gn93kwk39drw2l0fsqcaf8-sqlite-3.22.0.drv', '/nix/store/b39zyn18gcdbcqgmhnyqfmcnclv4a2m8-nspr-4.19.drv', '/nix/store/inm6zp52382b0h32xpqq4lancx6lmkk2-nss-3.36.1.drv' failed

@andir andir merged commit beb2a87 into NixOS:staging-18.03 May 12, 2018
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

4 participants