diff --git a/srcpkgs/rustup/patches/dont-copy-rustup-bin.patch b/srcpkgs/rustup/patches/dont-copy-rustup-bin.patch index d76404ee118..bf35ebe6875 100644 --- a/srcpkgs/rustup/patches/dont-copy-rustup-bin.patch +++ b/srcpkgs/rustup/patches/dont-copy-rustup-bin.patch @@ -1,14 +1,15 @@ Upstream: No, not upstreamable like this Reason: We want the rustup binary in $CARGO_HOME/bin to be of the same version as the one we distribute in this rustup package. ---- src/rustup-cli/self_update.rs.1 2018-12-13 21:56:55.211778812 +0100 -+++ src/rustup-cli/self_update.rs 2018-12-13 21:56:42.763779768 +0100 -@@ -671,8 +671,7 @@ +--- src/cli/self_update.rs.orig 2019-05-27 16:17:21.432715136 +0200 ++++ src/cli/self_update.rs 2019-05-27 16:18:56.537718683 +0200 +@@ -619,8 +619,7 @@ if rustup_path.exists() { - utils::remove_file("rustup-bin", rustup_path)?; + utils::remove_file("rustup-bin", &rustup_path)?; } -- utils::copy_file(this_exe_path, rustup_path)?; -- utils::make_executable(rustup_path)?; -+ utils::symlink_file(this_exe_path, rustup_path)?; +- utils::copy_file(&this_exe_path, &rustup_path)?; +- utils::make_executable(&rustup_path)?; ++ utils::symlink_file(&this_exe_path, &rustup_path)?; install_proxies() } + diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template index 79fa51e502f..27d9bec34d0 100644 --- a/srcpkgs/rustup/template +++ b/srcpkgs/rustup/template @@ -1,6 +1,6 @@ # Template file for 'rustup' pkgname=rustup -version=1.17.0 +version=1.18.3 revision=1 wrksrc="${pkgname}.rs-${version}" build_style=cargo @@ -12,7 +12,7 @@ maintainer="Daniel Lee Ramírez " license="Apache-2.0, MIT" homepage="https://www.rustup.rs" distfiles="https://github.com/rust-lang-nursery/${pkgname}.rs/archive/${version}.tar.gz" -checksum=6db73f9684b4d93de47cd511ebd56c2821c37bb41054a4a60060b496764f1f4d +checksum=9a2ae2c85bbbfc838b25d86d049bc677532950d78765725beabb8a61df1c2710 do_install() { vbin target/${RUST_TARGET}/release/rustup-init