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.37.0 -> 1.38.0 #69534

Merged
merged 3 commits into from Sep 30, 2019
Merged

rustc: 1.37.0 -> 1.38.0 #69534

merged 3 commits into from Sep 30, 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

This reverts commit b7a8280. It's no
longer needed with Rust 1.38.
@Mic92
Copy link
Member

Mic92 commented Sep 26, 2019

The postPatch phase needs an update on macOS: https://logs.nix.ci/?key=nixos/nixpkgs.69534&attempt_id=c1862a45-c16f-48d0-91e3-7b97d04d13b9

Since it does not look like we would get the test suite running again, how about removing all test-related patch commands in postPatch?

@LnL7
Copy link
Member

LnL7 commented Sep 26, 2019

It's been a few versions since I've tried to enable the tests again, but yeah we should remove the patches otherwise.

@basvandijk
Copy link
Member

Removing the offending line fixes the build for me on MacOS.

Tests have been disabled since over a year and now the
code starts to bit-rot. As it seems unlikely that they
will come back in near future, let's just remove it.
@edolstra edolstra merged commit 1be54bd into NixOS:master Sep 30, 2019
@Mic92
Copy link
Member

Mic92 commented Oct 2, 2019

I think this might have broke thunderbird: https://hydra.nixos.org/build/102506852/nixlog/1

@Mic92
Copy link
Member

Mic92 commented Oct 2, 2019

We should add rustc updates to staging in future again.

@Mic92
Copy link
Member

Mic92 commented Oct 2, 2019

fixed in #70229

@edolstra edolstra deleted the rustc-1.38.0 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