Merge pull request #21804 from exi/include-rust-beta-nightly

rust: make rust beta and nightly be build by hydra
This commit is contained in:
Graham Christensen 2017-01-12 07:33:26 -05:00 committed by GitHub
commit 193d206b17

View File

@ -5329,16 +5329,16 @@ in
rust = rustStable;
rustStable = callPackage ../development/compilers/rust {};
rustBeta = callPackage ../development/compilers/rust/beta.nix {};
rustNightly = callPackage ../development/compilers/rust/nightly.nix {
rustBeta = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/beta.nix {}));
rustNightly = lowPrio (recurseIntoAttrs (callPackage ../development/compilers/rust/nightly.nix {
rustPlatform = recurseIntoAttrs (makeRustPlatform rustBeta);
};
rustNightlyBin = callPackage ../development/compilers/rust/nightlyBin.nix {
}));
rustNightlyBin = lowPrio (callPackage ../development/compilers/rust/nightlyBin.nix {
buildRustPackage = callPackage ../build-support/rust {
rust = rustNightlyBin;
rustRegistry = callPackage ./rust-packages.nix { };
};
};
});
cargo = rust.cargo;
rustc = rust.rustc;