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.

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

Jump to bottom

[18.03] firefox{,-bin}: 62.0.3 -> 63.0 & nss: 3.38-> 3.39 #49096

Merged
merged 5 commits into from
Oct 25, 2018
Merged

[18.03] firefox{,-bin}: 62.0.3 -> 63.0 & nss: 3.38-> 3.39 #49096

merged 5 commits into from
Oct 25, 2018
+1,040 −405

Conversation

andir
Copy link
Member

@andir andir commented Oct 25, 2018 •
edited
Loading

Motivation for this change

This is the backport of #48862.

It also backports rust-cbindgen & rust_1_29 since firefox 63.0 requires them. For rust 1.28 would be sufficient but using 1.29 shouldn't hurt and might even help for the future Firefox bumps.

We were able to dodge the nss & nspr upgrade by using the bundled versions.

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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@GrahamcOfBorg GrahamcOfBorg added 6.topic: rust 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Oct 25, 2018
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: rust-cbindgen

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: rust-cbindgen

Partial log (click to expand)

make[3]: Leaving directory '/build/rustc-1.29.1-src/build/x86_64-unknown-linux-gnu/llvm/build'
make[3]: Entering directory '/build/rustc-1.29.1-src/build/x86_64-unknown-linux-gnu/llvm/build'
[ 72%] Building CXX object lib/Target/AArch64/InstPrinter/CMakeFiles/LLVMAArch64AsmPrinter.dir/AArch64InstPrinter.cpp.o
[ 72%] Building CXX object lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64ISelDAGToDAG.cpp.o
[ 72%] Building CXX object lib/Target/X86/CMakeFiles/LLVMX86CodeGen.dir/X86WinEHState.cpp.o
[ 72%] Building CXX object lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64ISelLowering.cpp.o
building of '/nix/store/zrz5vjm0hvv9n5zyaqnabm5gshd6ci0v-rustc-1.29.1.drv' timed out after 1800 seconds
cannot build derivation '/nix/store/y3nrfs3krpkc5wgjb1by667g9pzyq4za-cargo-1.29.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/3j65w424awdmdvn0c22mg0hwrkb5b6yh-rust-cbindgen-0.6.3.drv': 2 dependencies couldn't be built
error: build of '/nix/store/3j65w424awdmdvn0c22mg0hwrkb5b6yh-rust-cbindgen-0.6.3.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: rust-cbindgen

Partial log (click to expand)

cp: -r not specified; omitting directory 'target/release/native'
cp: -r not specified; omitting directory 'target/release/deps'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/626h5ynd42nv77w3q8ijqp9kcv3i7yhg-rust-cbindgen-0.6.3
shrinking /nix/store/626h5ynd42nv77w3q8ijqp9kcv3i7yhg-rust-cbindgen-0.6.3/bin/cbindgen
strip is /nix/store/hy39vplmzpwckvzxgyhr54dwz0mnfv2p-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/626h5ynd42nv77w3q8ijqp9kcv3i7yhg-rust-cbindgen-0.6.3/bin
patching script interpreter paths in /nix/store/626h5ynd42nv77w3q8ijqp9kcv3i7yhg-rust-cbindgen-0.6.3
checking for references to /build in /nix/store/626h5ynd42nv77w3q8ijqp9kcv3i7yhg-rust-cbindgen-0.6.3...
/nix/store/626h5ynd42nv77w3q8ijqp9kcv3i7yhg-rust-cbindgen-0.6.3

@andir
firefox-esr-60: 60.2.2esr -> 60.3.0esr
5dd4087 
(cherry picked from commit 3db6ca50ef0ce27b4f9765b783dcc32c0a613a2d)
@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: rust-cbindgen

Partial log (click to expand)

/nix/store/626h5ynd42nv77w3q8ijqp9kcv3i7yhg-rust-cbindgen-0.6.3

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: rust-cbindgen

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: rust-cbindgen

Partial log (click to expand)

make[3]: Entering directory '/build/rustc-1.29.1-src/build/x86_64-unknown-linux-gnu/llvm/build'
Scanning dependencies of target LLVMAArch64Desc
make[3]: Leaving directory '/build/rustc-1.29.1-src/build/x86_64-unknown-linux-gnu/llvm/build'
make[3]: Entering directory '/build/rustc-1.29.1-src/build/x86_64-unknown-linux-gnu/llvm/build'
[ 71%] Building CXX object lib/Target/AArch64/MCTargetDesc/CMakeFiles/LLVMAArch64Desc.dir/AArch64AsmBackend.cpp.o
[ 71%] Building CXX object lib/Target/AArch64/CMakeFiles/LLVMAArch64CodeGen.dir/AArch64AsmPrinter.cpp.o
building of '/nix/store/zrz5vjm0hvv9n5zyaqnabm5gshd6ci0v-rustc-1.29.1.drv' timed out after 1800 seconds
cannot build derivation '/nix/store/y3nrfs3krpkc5wgjb1by667g9pzyq4za-cargo-1.29.1.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/3j65w424awdmdvn0c22mg0hwrkb5b6yh-rust-cbindgen-0.6.3.drv': 2 dependencies couldn't be built
error: build of '/nix/store/3j65w424awdmdvn0c22mg0hwrkb5b6yh-rust-cbindgen-0.6.3.drv' failed

@andir andir merged commit b4e3a40 into NixOS:release-18.03 Oct 25, 2018
@andir andir deleted the 18.03/firefox branch October 25, 2018 22:53
adrianpk added a commit to adrianpk/nixpkgs that referenced this pull request May 31, 2024
@adrianpk
Merge pull request NixOS#49096 from andir/18.03/firefox
0d8fd0a 
[18.03] firefox{,-bin}: 62.0.3 -> 63.0 & nss: 3.38-> 3.39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: rust 8.has: documentation This PR adds or changes documentation 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@andir @GrahamcOfBorg @jtojnar