Merge pull request #35240 from dywedir/rustup

rustup: 2017-10-29 -> 1.11.0
This commit is contained in:
Jörg Thalheim 2018-02-20 22:03:19 +00:00 committed by GitHub
commit f6ae7c5a01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4,15 +4,15 @@
rustPlatform.buildRustPackage rec {
name = "rustup-${version}";
version = "2017-10-29";
version = "1.11.0";
cargoSha256 = "1xwxv8y9xjgdmm92ldrn9m9fml2zb5h7qqm7dhw63j6psb3ajqrw";
cargoSha256 = "1r9mnj3x9sn16hi1r09gl5q0cnsa2g6kbjw2g115858i2a9k6hkr";
src = fetchFromGitHub {
owner = "rust-lang-nursery";
repo = "rustup.rs";
rev = "13c8092507bf646f3ef6a621fe2c5a68212e800f";
sha256 = "1qd01rjk9qpfzgqs35f5nxrcf00kmf76zwmgj3yzdig9zymjwndg";
rev = version;
sha256 = "05rbgkz4fk6c1x6bpmpx108bg2qcrf6vv3yfz378s7bmr3l319iz";
};
nativeBuildInputs = [ pkgconfig ];
@ -35,23 +35,23 @@ rustPlatform.buildRustPackage rec {
postInstall = ''
pushd $out/bin
mv rustup-init rustup
for link in cargo rustc rustdoc rust-gdb rust-lldb; do
for link in cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt; do
ln -s rustup $link
done
popd
# tries to create .rustup
export HOME=$(mktemp -d)
mkdir -p "$out/share/"{bash-completion/completions,fish/completions,zsh/site-functions}
mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
$out/bin/rustup completions bash > "$out/share/bash-completion/completions/rustup"
$out/bin/rustup completions fish > "$out/share/fish/completions/rustup.fish"
$out/bin/rustup completions fish > "$out/share/fish/vendor_completions.d/rustup.fish"
$out/bin/rustup completions zsh > "$out/share/zsh/site-functions/_rustup"
'';
meta = with stdenv.lib; {
description = "The Rust toolchain installer";
homepage = https://www.rustup.rs/;
license = licenses.mit;
license = with licenses; [ asl20 /* or */ mit ];
maintainers = [ maintainers.mic92 ];
};
}