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.34.2 -> 1.35.0 #63099

Merged
merged 3 commits into from Jul 3, 2019
Merged

rustc: 1.34.2 -> 1.35.0 #63099

merged 3 commits into from Jul 3, 2019

Conversation

edolstra
Copy link
Member

Motivation for this change
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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Mic92
Copy link
Member

Mic92 commented Jun 15, 2019

fd builds and runs on linux-x86_64/linux-aarch64.

@Mic92
Copy link
Member

Mic92 commented Jun 15, 2019

macOS seems to have a build problem:

https://logs.nix.ci/?key=nixos/nixpkgs.63099&attempt_id=6794ed4e-fcbd-4308-9fe9-458a9a87bc95

error: install_name_tool: changing install names or rpaths can't be redone for: /nix/store/mxb4iiivxv30qvwi7z21xkzhz28175hc-rustc-bootstrap-1.34.2/lib/librustc_typeck-f577d18db8fe4627.dylib (for architecture x86_64) because larger updated load commands do not fit (the program must be relinked, and you may need to use -headerpad or -headerpad_max_install_names)

This doesn't work anymore since 1.35.0 because the load commands end up
being too large, but this is a precompiled binary anyway so it's not
really needed or more impure to use the expected system versions.
@@ -85,7 +75,8 @@ rec {
license = [ licenses.mit licenses.asl20 ];
};

buildInputs = [ makeWrapper bash ] ++ stdenv.lib.optional stdenv.isDarwin Security;
buildInputs = [ makeWrapper bash ]
Copy link
Member

Choose a reason for hiding this comment

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

@Mic92 do you remember why you added bash here?

Copy link
Member

Choose a reason for hiding this comment

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

@LnL7 also looks suspicious to me. It would only make a difference in a cross-compiled build. We can properly drop it.

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.

If macOS builds, we can merge this!

@LnL7
Copy link
Member

LnL7 commented Jul 1, 2019

Yep, has anyboy tested firefox?

@FRidh FRidh merged commit 368c415 into NixOS:master Jul 3, 2019
@Mic92
Copy link
Member

Mic92 commented Jul 3, 2019

I was able to build firefox.

@edolstra edolstra deleted the rust-1.35 branch October 9, 2019 18:05
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