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

rustc: 1.27 -> 1.29 #46647

Merged
merged 1 commit into from Sep 17, 2018
Merged

rustc: 1.27 -> 1.29 #46647

merged 1 commit into from Sep 17, 2018

Conversation

symphorien
Copy link
Member

Motivation for this change

rls is buggy on 1.27

Changelog: https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1290-2018-09-13

Things done

I tried to build with tests enabled. It first failed on some gdb tests which depend on the gdb version. I disabled them, and the next batch of tests also contained some failing tests so I gave up.

I built eog (depending on librsvg), firefox and fd (on x86_64-linux). Firefox needs a patch from upstream. cc @taku0 who has been updating firefox for some time.

cc @madjar @cstrahan @wizeman @globin @Havvy @wkennington as maintainers.

# https://github.com/rust-lang/rust/issues/39522
echo removing gdb-version-sensitive tests...
find src/test/debuginfo -type f -execdir grep -q ignore-gdb-version '{}' \; -print -delete
rm src/test/debuginfo/{borrowed-c-style-enum.rs,c-style-enum-in-composite.rs,gdb-pretty-struct-and-enums-pre-gdb-7-7.rs,generic-enum-with-different-disr-sizes.rs}
Copy link
Member

Choose a reason for hiding this comment

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

Agreed, it is not super critical for us and I don't feel like we would be in the position to fix this anyway.

Copy link
Member

Choose a reason for hiding this comment

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

Aren't the tests still disabled? 323fe3a

Copy link
Member

@Mic92 Mic92 Sep 14, 2018

Choose a reason for hiding this comment

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

Ah yes, he tried to enable them, but hit another roadblock.

Copy link
Member

Choose a reason for hiding this comment

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

@symphorien Do you still have the error, or was it something useless?

Copy link
Member Author

Choose a reason for hiding this comment

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

This addition is useless since tests are disabled, but I thought it may be useful to leave it here if someone tries to reenable tests in the future. I can remove this if you wish so.

@@ -28,6 +28,9 @@ rustPlatform.buildRustPackage rec {

LIBGIT2_SYS_USE_PKG_CONFIG=1;

# fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
Copy link
Member

Choose a reason for hiding this comment

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

Do they build there own rustc also with rust-nightly?

Copy link
Member Author

Choose a reason for hiding this comment

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

Hum this is a puzzle. They build with stable: https://travis-ci.org/rust-lang/cargo/jobs/428486115#L685-L690
but if I uncomment this line, I get:

building
/tmp/nix-build-cargo-1.29.0.drv-0/rustc-1.29.0-src/src/tools/cargo /tmp/nix-build-cargo-1.29.0.drv-0/rustc-1.29.0-src/src
Running cargo build --release
error: failed to parse manifest at `/tmp/nix-build-cargo-1.29.0.drv-0/rustc-1.29.0-src/src/tools/clippy/Cargo.toml`

Caused by:
  the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
builder for '/nix/store/8z2nqw2x302mcbixsca73d4qazyfq7ys-cargo-1.29.0.drv' failed with exit code 101

and indeed in the source tarball the file rustc-1.29.0-src/src/tools/clippy/Cargo.toml starts with

cargo-features = ["edition"]

and this feature is indeed unstable: rust-lang/cargo@56ee620

So I don't know what happens here.

Copy link
Member

@Mic92 Mic92 left a comment

Choose a reason for hiding this comment

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

I works on aarch64-linux and x86_64-linux.

@Mic92
Copy link
Member

Mic92 commented Sep 14, 2018

@LnL7 can we get your hydra build for macOS?

@LnL7
Copy link
Member

LnL7 commented Sep 14, 2018

Sure, I'll update my rust jobset.

@Mic92
Copy link
Member

Mic92 commented Sep 15, 2018

@LnL7 did it build?

@LnL7
Copy link
Member

LnL7 commented Sep 17, 2018

Yep, looks good.

@Mic92 Mic92 merged commit 87ed5ba into NixOS:staging Sep 17, 2018
@symphorien symphorien deleted the rust-1.29 branch May 18, 2019 16:01
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