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

rust: 1.22.1 -> 1.24.0 #35030

Merged
merged 7 commits into from Feb 20, 2018
Merged

rust: 1.22.1 -> 1.24.0 #35030

merged 7 commits into from Feb 20, 2018

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Feb 16, 2018 •
edited

Motivation for this change

status:

  • builds & run tests on x86_64-linux, firefox builds
  • build & run tests on x86_64-darwin, firefox builds (thanks to @LnL7)
  • builds & run tests on aarch64
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.

@bkchr
Copy link
Contributor

bkchr commented Feb 16, 2018

I think we will need to start installing cargo that is compiled with the rustc. Cargo does not ship anymore a Cargo.lock file, the file can only be found in the rustc repo.

@Mic92 Mic92 mentioned this pull request Feb 16, 2018
Closed
8 tasks
@Mic92
Copy link
Member Author

Mic92 commented Feb 16, 2018 •
edited

Using a vendored cargo was already done before by @bennofs in #34505

@bkchr
Copy link
Contributor

bkchr commented Feb 16, 2018

Ohh, perfect :)

@bkchr
Copy link
Contributor

bkchr commented Feb 16, 2018

@Mic92 could you also re-enable the following tests? https://github.com/Mic92/nixpkgs/blob/82904b81d3540eb04edd8e26df516718112c9e6a/pkgs/development/compilers/rust/rustc.nix#L101

bennofs and others added 6 commits February 16, 2018 15:09
@bennofs @Mic92
rustc: don't disable locked deps
e2ffc14 
Use upstream deps.
@bennofs @Mic92
rust: fix "failed to acquire jobserver" build error
01d0550 
This commit updates the jobserver library used for building the rust platform
to version 0.1.9, which fixes the following error that sometimes happens during
large builds:

```
thread '<unnamed>' panicked at 'failed to acquire jobserver token: Resource temporarily unavailable (os error 11)', src/librustc_trans/back/write.rs:1619:28
note: Run with `RUST_BACKTRACE=1` for a backtrace.
error: failed to acquire jobserver token: Resource temporarily unavailable (os
error 11)
```
@Mic92
rust: 1.22.1 -> 1.24.0
9ed1baa
@Mic92
rust-bootstrap: patch shebangs in install scripts
8e36415
@Mic92
rustc: update disable-test_loading_cosine patch for 1.24
f7afe5c
@Mic92
rust: renable gdb tests
f5893eb
@Mic92
Copy link
Member Author

Mic92 commented Feb 16, 2018

There are some test failures for aarch64:

https://dl.thalheim.io/EooT4f1a-0RRi1mBx9Vevg/rustc-1.24-failing-tests.log

I have not yet looked into them.

LnL7
LnL7 approved these changes Feb 17, 2018
View reviewed changes
Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

Tested the darwin builds, a simple rust package and firefox, everything seems to be working.

@Ralith
Copy link
Contributor

Ralith commented Feb 18, 2018

This will un-break the build of pretty much every large rust package. Looking forward to the merge!

@Mic92
Copy link
Member Author

Mic92 commented Feb 19, 2018 •
edited

I can't debug the run-make tests on aarch64 without a machine where I have root access to get into the sandbox.

@bkchr
Copy link
Contributor

bkchr commented Feb 19, 2018

@Mic92 couldn't you create a aarch64 qemu vm to debug the problem?

Mic92
Mic92 commented Feb 19, 2018
View reviewed changes
pkgs/development/compilers/rust/rustc.nix
@@ -72,6 +72,8 @@ stdenv.mkDerivation {
passthru.target = target;

postPatch = ''
patchShebangs src/etc
Copy link
Member Author

Choose a reason for hiding this comment

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

Hopefully that fixes the problem on aarch64. Build is still going on.

@Mic92 Mic92 changed the title [WIP] Rustc 1.24.0 rust: 1.22.1 -> 1.24.0 Feb 20, 2018
@Mic92 Mic92 merged commit f61e8d9 into NixOS:master Feb 20, 2018
@Mic92 Mic92 deleted the rustc-1.24.0 branch February 20, 2018 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 approved these changes

Assignees
No one assigned
Labels
6.topic: rust 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Mic92 @bkchr @Ralith @LnL7 @GrahamcOfBorg @bennofs