Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 83410d9954ff
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bfc187f23a80
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 28, 2016

  1. rustc: Don't fail if deleting of breaking tests fails.

    @the-kenny
    the-kenny committed Nov 28, 2016
    Copy the full SHA
    e36d243 View commit details

  2. rustc: Loosen bootstrapping restrictions. 

    Newer nightlies check a new environment variable that if set will loosen
restrictions on which compiler version can be used for bootstrapping.

Upstream issue is at rust-lang/rust#37265
    @the-kenny
    the-kenny committed Nov 28, 2016
    Copy the full SHA
    bfc187f View commit details
Showing with 9 additions and 3 deletions.
  1. +9 −3 pkgs/development/compilers/rust/rustc.nix
12 changes: 9 additions & 3 deletions pkgs/development/compilers/rust/rustc.nix
View file
Original file line number Diff line number Diff line change
@@ -46,6 +46,12 @@ stdenv.mkDerivation {

NIX_LDFLAGS = optionalString stdenv.isDarwin "-rpath ${llvmShared}/lib";

# Enable nightly features in stable compiles (used for
# bootstrapping, see https://github.com/rust-lang/rust/pull/37265).
# This loosens the hard restrictions on bootstrapping-compiler
# versions.
RUSTC_BOOTSTRAP = "1";

src = fetchgit {
url = https://github.com/rust-lang/rust;
rev = srcRev;
@@ -88,14 +94,14 @@ stdenv.mkDerivation {
#[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
# Disable fragile linker-output-non-utf8 test
rm -vr src/test/run-make/linker-output-non-utf8/
rm -vr src/test/run-make/linker-output-non-utf8 || true
# Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835
rm -vr src/test/run-pass/issue-36023.rs
rm -vr src/test/run-pass/issue-36023.rs || true
# Disable test getting stuck on hydra - possible fix:
# https://reviews.llvm.org/rL281650
rm -vr src/test/run-pass/issue-36474.rs
rm -vr src/test/run-pass/issue-36474.rs || true
# Useful debugging parameter
# export VERBOSE=1